Commit: 31e96cbf96a2bd26b77a29bf4cd8475a53521539
Author: Campbell Barton
Date: Fri May 15 23:38:53 2015 +1000
Branches: master
https://developer.blender.org/rB31e96cbf96a2bd26b77a29bf4cd8475a53521539
Cleanup: style, spelling
===================================================================
M intern/cycles/device/device_opencl.cpp
M intern/cycles/kernel/kernel_types.h
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/depsgraph/intern/depsnode.h
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/space_node/node_draw.c
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp
b/intern/cycles/device/device_opencl.cpp
index 75d08cb..f77b567 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1104,7 +1104,7 @@ protected:
clGetDeviceInfo(cdDevice,
CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV,
sizeof(cl_uint),
&compute_capability_minor, NULL);
- build_options +=
string_printf("-D__COMPUTE_CAPABILITY__=%d ",
+ build_options +=
string_printf("-D__COMPUTE_CAPABILITY__=%u ",
compute_capability_major
* 100 +
compute_capability_minor
* 10);
}
@@ -1449,7 +1449,7 @@ public:
};
/* TODO(sergey): This is to keep tile split on OpenCL level working
- * for now, since withotu this viewport render does not work as it
+ * for now, since without this view-port render does not work as it
* should.
*
* Ideally it'll be done on the higher level, but we need to get ready
@@ -1489,7 +1489,7 @@ public:
buffers = tile.buffers;
}
- /* Split kernel is device global memory constained;
+ /* Split kernel is device global memory constrained;
* hence split kernel cant render big tile size's in
* one go. If the user sets a big tile size (big tile size
* is a term relative to the available device global memory),
@@ -1536,7 +1536,7 @@ public:
/* Global memory variables [porting]; These memory is used for
* co-operation between different kernels; Data written by one
- * kernel will be avaible to another kernel via this global
+ * kernel will be available to another kernel via this global
* memory.
*/
cl_mem rng_coop;
diff --git a/intern/cycles/kernel/kernel_types.h
b/intern/cycles/kernel/kernel_types.h
index 769ffa8..294a491 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -467,7 +467,7 @@ typedef struct differential {
typedef struct Ray {
/* TODO(sergey): This is only needed because current AMD
- * compilet has hard time bulding the kernel with this
+ * compiler has hard time building the kernel with this
* reshuffle. And at the same time reshuffle will cause
* less optimal CPU code in certain places.
*
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c
b/source/blender/blenkernel/intern/pbvh_bmesh.c
index a6e0ca3..e631a4a 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1510,8 +1510,8 @@ static void pbvh_bmesh_node_limit_ensure_fast(PBVH *bvh,
BMFace **nodeinfo, BBC
num_child2--;
}
- /* at this point, faces should have been split along the array range
sequencially, each sequencial
- * part belonging to one node only */
+ /* at this point, faces should have been split along the array range
sequentially,
+ * each sequential part belonging to one node only */
BLI_assert((num_child1 + num_child2) == node->totface);
node->child1 = child1 = BLI_memarena_alloc(arena,
sizeof(FastNodeBuildInfo));
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c
b/source/blender/blenkernel/intern/subsurf_ccg.c
index 68ef156..e4d178d 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -300,7 +300,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf
*origss, DerivedMesh *dm,
float uv[3] = {0.0f, 0.0f, 0.0f}; /* only first 2 values are written
into */
limit[0] = limit[1] = STD_UV_CONNECT_LIMIT;
- /* previous behaviour here is without accounting for winding, however
this causes stretching in
+ /* previous behavior here is without accounting for winding, however
this causes stretching in
* UV map in really simple cases with mirror + subsurf, see second part
of T44530. Also, initially
* intention is to treat merged vertices from mirror modifier as seams,
see code below with ME_VERT_MERGED
* This fixes a very old regression (2.49 was correct here) */
diff --git a/source/blender/bmesh/intern/bmesh_core.c
b/source/blender/bmesh/intern/bmesh_core.c
index 2a69edd..ee2ade5 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -2633,7 +2633,7 @@ static void bmesh_edge_vert_swap__recursive(BMEdge *e,
BMVert *v_dst, BMVert *v_
/**
* This function assumes l_sep is apart of a larger fan which has already been
- * isolated by calling bmesh_edge_separate to segragate it radially.
+ * isolated by calling bmesh_edge_separate to segregate it radially.
*/
BMVert *bmesh_urmv_loop_region(BMesh *bm, BMLoop *l_sep)
{
diff --git a/source/blender/depsgraph/intern/depsnode.h
b/source/blender/depsgraph/intern/depsnode.h
index 84554ae..4f3dc3b 100644
--- a/source/blender/depsgraph/intern/depsnode.h
+++ b/source/blender/depsgraph/intern/depsnode.h
@@ -195,7 +195,7 @@ struct IDDepsNode : public DepsNode {
int layers;
/* Additional flags needed for scene evaluation.
- * TODO(sergey): Only needed for until really granual updates
+ * TODO(sergey): Only needed for until really granular updates
* of all the entities.
*/
int eval_flags;
diff --git a/source/blender/editors/animation/anim_draw.c
b/source/blender/editors/animation/anim_draw.c
index 7d669e8..d594542 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -389,7 +389,8 @@ float ANIM_unit_mapping_get_factor(Scene *scene, ID *id,
FCurve *fcu, short flag
return 1.0f;
}
-static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int
*prevfra) {
+static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int
*prevfra)
+{
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
bGPdata *gpd = CTX_data_gpencil_data(C);
diff --git a/source/blender/editors/space_node/node_draw.c
b/source/blender/editors/space_node/node_draw.c
index c89bf8d..34efba0 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -125,7 +125,7 @@ void ED_node_tag_update_id(ID *id)
return;
/* TODO(sergey): With the new dependency graph it
- * should be just enough to ony tag ntree itself,
+ * should be just enough to only tag ntree itself,
* all the users of this tree will have update
* flushed from the tree,
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
