[Bf-blender-cvs] [4ab821c] master: Cleanup: Typo fixes for comments.

[Thomas Dinges]

Commit: 4ab821c6755b86195e462fe270d70de466142817
Author: Thomas Dinges
Date:   Thu Dec 25 02:42:06 2014 +0100
Branches: master
https://developer.blender.org/rB4ab821c6755b86195e462fe270d70de466142817

Cleanup: Typo fixes for comments.

===================================================================

M	intern/cycles/blender/addon/ui.py
M	intern/cycles/bvh/bvh.cpp
M	intern/cycles/kernel/geom/geom_triangle_intersect.h

===================================================================

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 52964ca..6f99112 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -320,7 +320,8 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
 
         col.label(text="Acceleration structure:")
         col.prop(cscene, "debug_use_spatial_splits")
-        col.prop(cscene, "use_qbvh")
+        if use_cpu(context):
+            col.prop(cscene, "use_qbvh")
 
 
 class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel):
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index eafb611..c0cb41c 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -449,8 +449,8 @@ void BVH::pack_instances(size_t nodes_size)
 
 		/* merge nodes */
 		if(bvh->pack.nodes.size()) {
-			/* For QBVH we're packing ann child bbox into 6 float4,
-			 * and for regulat BVH they're packed into 3 float4.
+			/* For QBVH we're packing a child bbox into 6 float4,
+			 * and for regular BVH they're packed into 3 float4.
 			 */
 			size_t nsize_bbox = (use_qbvh)? 6: 3;
 			int4 *bvh_nodes = &bvh->pack.nodes[0];
@@ -479,8 +479,8 @@ void BVH::pack_instances(size_t nodes_size)
 
 				pack_nodes[pack_nodes_offset + nsize_bbox] = data;
 
-				/* Usually this is gonna to copy nothing, but we'd better to
-				 * beprepared for possible node size extension.
+				/* Usually this copies nothing, but we better
+				 * be prepared for possible node size extension.
 				 */
 				memcpy(&pack_nodes[pack_nodes_offset + nsize_bbox+1],
 				       &bvh_nodes[i + nsize_bbox+1],
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 8ed0e15..049e8f3 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -22,7 +22,7 @@
 
 CCL_NAMESPACE_BEGIN
 
-/* Workaroudn stupidness of CUDA/OpenCL which doesn't allow to access indexed
+/* Workaround stupidness of CUDA/OpenCL which doesn't allow to access indexed
  * component of float3 value.
  */
 #ifndef __KERNEL_CPU__
@@ -52,7 +52,7 @@ typedef struct IsectPrecalc {
 ccl_device_inline void triangle_intersect_precalc(float3 dir,
                                                   IsectPrecalc *isect_precalc)
 {
-	/* Calculate dimesion where the ray direction is maximal. */
+	/* Calculate dimension where the ray direction is maximal. */
 	int kz = util_max_axis(make_float3(fabsf(dir.x),
 	                                   fabsf(dir.y),
 	                                   fabsf(dir.z)));