diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-12-25 04:42:06 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-12-25 04:42:06 +0300 |
| commit | 4ab821c6755b86195e462fe270d70de466142817 (patch) | |
| tree | 3ab6570bff4bdef1504f4051a95549f0adeea92e /intern | |
| parent | 6e7c2d2e432d415ac20bd554728ad5acf6123eb5 (diff) | |
Cleanup: Typo fixes for comments.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 3 | ||||
| -rw-r--r-- | intern/cycles/bvh/bvh.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 52964ca0df4..6f99112651f 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 eafb611b015..c0cb41c5e22 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 8ed0e15e6ac..049e8f3680e 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))); |