Commit: 9c3025cd26d547667847c81ec53b503d876be906
Author: Campbell Barton
Date: Sat Aug 2 16:53:52 2014 +1000
Branches: master
https://developer.blender.org/rB9c3025cd26d547667847c81ec53b503d876be906
Spelling
===================================================================
M intern/cycles/bvh/bvh_params.h
M intern/cycles/device/device.cpp
M intern/cycles/device/device_cuda.cpp
M intern/cycles/kernel/closure/bsdf_microfacet.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/kernel/kernel_accumulate.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/render/scene.cpp
M intern/ghost/intern/GHOST_DropTargetX11.h
M intern/ghost/intern/GHOST_SystemCocoa.h
M intern/ghost/intern/GHOST_SystemWin32.h
M intern/ghost/intern/GHOST_TimerTask.h
M intern/ghost/intern/GHOST_WindowCocoa.h
M intern/ghost/intern/GHOST_WindowManager.h
M intern/ghost/intern/GHOST_WindowWin32.cpp
M intern/ghost/intern/GHOST_WindowWin32.h
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/compositor/operations/COM_SunBeamsOperation.cpp
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
diff --git a/intern/cycles/bvh/bvh_params.h b/intern/cycles/bvh/bvh_params.h
index ed67690..e073b69 100644
--- a/intern/cycles/bvh/bvh_params.h
+++ b/intern/cycles/bvh/bvh_params.h
@@ -123,7 +123,7 @@ protected:
/* BVH Range
*
* Build range used during construction, to indicate the bounds and place in
- * the reference array of a subset of pirmitives Again uses trickery to pack
+ * the reference array of a subset of primitives Again uses trickery to pack
* integers into BoundBox for alignment purposes. */
class BVHRange
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp
index 7fd1b79..fa1f0ac 100644
--- a/intern/cycles/device/device.cpp
+++ b/intern/cycles/device/device.cpp
@@ -66,7 +66,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w,
int h, int dy, int w
glColor3f(1.0f, 1.0f, 1.0f);
if(rgba.data_type == TYPE_HALF) {
- /* for multi devices, this assumes the ineffecient method that
we allocate
+ /* for multi devices, this assumes the inefficient method that
we allocate
* all pixels on the device even though we only render to a
subset */
GLhalf *data_pointer = (GLhalf*)rgba.data_pointer;
data_pointer += 4*y*w;
diff --git a/intern/cycles/device/device_cuda.cpp
b/intern/cycles/device/device_cuda.cpp
index 1c7f3a0..f0f32f8 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -732,8 +732,8 @@ public:
const int start = task.shader_x;
const int end = task.shader_x + task.shader_w;
- bool cancelled = false;
- for(int sample = 0; sample < task.num_samples && !cancelled;
sample++) {
+ bool canceled = false;
+ for(int sample = 0; sample < task.num_samples && !canceled;
sample++) {
for(int shader_x = start; shader_x < end; shader_x +=
shader_chunk_size) {
int shader_w = min(shader_chunk_size, end -
shader_x);
@@ -760,7 +760,7 @@ public:
cuda_assert(cuCtxSynchronize());
if(task.get_cancel()) {
- cancelled = false;
+ canceled = false;
break;
}
}
@@ -907,7 +907,7 @@ public:
cuda_push_context();
- /* for multi devices, this assumes the ineffecient
method that we allocate
+ /* for multi devices, this assumes the inefficient
method that we allocate
* all pixels on the device even though we only render
to a subset */
size_t offset = 4*y*w;
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h
b/intern/cycles/kernel/closure/bsdf_microfacet.h
index 870b568..a0c59e6 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet.h
@@ -362,7 +362,7 @@ ccl_device_inline float3 microfacet_sample_stretched(
* E. Heitz, Research Report 2014
*
* Anisotropy is only supported for reflection currently, but adding it for
- * tranmission is just a matter of copying code from reflection if needed. */
+ * transmission is just a matter of copying code from reflection if needed. */
ccl_device int bsdf_microfacet_ggx_setup(ShaderClosure *sc)
{
diff --git a/intern/cycles/kernel/geom/geom_triangle.h
b/intern/cycles/kernel/geom/geom_triangle.h
index 6fffbc7..27d1351 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@ -18,7 +18,7 @@
/* Triangle Primitive
*
* Basic triangle with 3 vertices is used to represent mesh surfaces. For BVH
- * ray intersection we use a precomputed triangle storage to accelarate
+ * ray intersection we use a precomputed triangle storage to accelerate
* intersection at the cost of more memory usage */
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/kernel/kernel_accumulate.h
b/intern/cycles/kernel/kernel_accumulate.h
index b4f6dcd..5b2233f 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -111,7 +111,7 @@ ccl_device_inline void bsdf_eval_mul(BsdfEval *eval, float3
value)
/* Path Radiance
*
* We accumulate different render passes separately. After summing at the end
- * to get the combined result, it should be identical. We definte directly
+ * to get the combined result, it should be identical. We definite directly
* visible as the first non-transparent hit, while indirectly visible are the
* bounces after that. */
diff --git a/intern/cycles/kernel/svm/svm_closure.h
b/intern/cycles/kernel/svm/svm_closure.h
index 5fcc44e..f4e2d6e 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -371,7 +371,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
if(sc) {
/* todo: giving a fixed weight here
will cause issues when
- * mixing multiple BSDFS. energey will
not be conserved and
+ * mixing multiple BSDFS. energy will
not be conserved and
* the throughput can blow up after
multiple bounces. we
* better figure out a way to skip
backfaces from rays
* spawned by transmission from the
front */
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index cf0f0bc..796007b 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -141,7 +141,7 @@ void Scene::device_update(Device *device_, Progress&
progress)
* the different managers, using data computed by previous managers.
*
* - Image manager uploads images used by shaders.
- * - Camera may be used for adapative subdivison.
+ * - Camera may be used for adaptive subdivision.
* - Displacement shader must have all shader data available.
* - Light manager needs lookup tables and final mesh data to compute
emission CDF.
* - Film needs light manager to run for use_light_visibility
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.h
b/intern/ghost/intern/GHOST_DropTargetX11.h
index 0254139..9ac45ba 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.h
+++ b/intern/ghost/intern/GHOST_DropTargetX11.h
@@ -73,7 +73,7 @@ private:
/* Internal helper functions */
/**
- * Initiailize XDND and all related X atoms
+ * Initialize XDND and all related X atoms
*/
void Initialize(void);
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h
b/intern/ghost/intern/GHOST_SystemCocoa.h
index 7d58c58..9b30abe 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.h
@@ -265,7 +265,7 @@ public:
protected:
/**
* Initializes the system.
- * For now, it justs registers the window class (WNDCLASS).
+ * For now, it just registers the window class (WNDCLASS).
* \return A success value.
*/
virtual GHOST_TSuccess init();
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h
b/intern/ghost/intern/GHOST_SystemWin32.h
index 18aadfb..79fed06 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -215,7 +215,7 @@ public:
protected:
/**
* Initializes the system.
- * For now, it justs registers the window class (WNDCLASS).
+ * For now, it just registers the window class (WNDCLASS).
* \return A success value.
*/
virtual GHOST_TSuccess init();
@@ -231,7 +231,7 @@ protected:
* \param window-> The window for this handling
* \param vKey The virtual key from hardKey
* \param ScanCode The ScanCode of pressed key (simular to PS/2
Set 1)
- * \param extend Flag if key is not primerly (left or right)
+ * \param extend Flag if key is not primly (left or right)
* \return The GHOST key (GHOST_kKeyUnknown if no match).
*/
virtual GHOST_TKey convertKey(GHOST_IWindow *window, short vKey, short
ScanCode, short extend) const;
diff --git a/intern/ghost/intern/GHOST_TimerTask.h
b/intern/ghost/intern/GHOST_TimerTask.h
index e8f5ecd..e33788e 100644
--- a/intern/ghost/intern/GHOST_TimerTask.h
+++ b/intern/ghost/intern/GHOST_TimerTask.h
@@ -48,7 +48,7 @@ public:
* Constructor.
* \param start The timer start time.
* \param interval The interval between calls to the timerProc
- * \param timerProc The callbak invoked when the interval expires.
+ * \param timerProc The callback invoked when the interval expires.
* \param data The timer user data.
*/
GHOST_TimerTask(GHOST_TUns64 start,
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h
b/intern/ghost/intern/GHOST_WindowCocoa.h
index 082256a..b30f6a3 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowCocoa.h
@@ -126,7 +126,7 @@ public:
/**
* Returns the client rectangle dimensions.
* The left and top members of the rectangle are always zero.
- * \param bounds The bounding rectangle of the cleient area of the
window.
+ * \param bounds The bounding rectangle of the client area of the
window.
*/
virtual void getClientBounds(GHOST_Rect& bounds) const;
diff --git a/intern/ghost/intern/GHOST_WindowManager.h
b/intern/ghost/intern/GHOST_WindowManager.h
index ecf0cb3..79438c0 100644
--- a/intern/ghost/intern/GHOST_WindowManager.h
+++ b/intern/ghost/intern/GHOST_WindowManager.h
@@ -121,7 +121,7 @@ public:
/**
* Set this window to be inactive (not receiving events).
- * \param window The window to decativate.
+ * \param window The window to deactivate.
*/
virtual void setWindowInactive(const GHOST_IWindow *window);
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp
b/intern/ghost/intern/GHOST_WindowWin32.cpp
index f8264b6..a9fa7fe 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -65,7 +65,7 @@ static int EnumPixelFormats(HDC hdc);
* and 16 depth bits.
* When the screen color depth is set to 32 bit, we get 8 color bits
* and 24 depth bits.
- * Just to be safe, we request high waulity settings.
+ * Just to be safe, we request high quality settings.
*/
static PIXELFORMATDESCRIPTOR sPreferredFormat = {
sizeof(PIXELFORMATDESCRIPTOR), /* size */
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h
b/intern/ghost/intern/GHOST_WindowWin32.h
index 4ccb24c..cb6c09b 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -146,7 +146,7 @@ public:
/**
* Returns the client rectangle dimensions.
* The left and top members of the rectangle are always zero.
- * \param bounds The bounding rectangle of the cleient area of the
window.
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
