[Bf-blender-cvs] [ccb8e78d6cf] master: Cleanup: whitespace

Campbell Barton noreply at git.blender.org
Sat Aug 12 05:57:31 CEST 2017


Commit: ccb8e78d6cf44de53e7a49386d2b95636c593894
Author: Campbell Barton
Date:   Sat Aug 12 13:37:34 2017 +1000
Branches: master
https://developer.blender.org/rBccb8e78d6cf44de53e7a49386d2b95636c593894

Cleanup: whitespace

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

M	source/blender/blenkernel/intern/appdir.c
M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/blentranslation/msgfmt/msgfmt.c
M	source/blender/depsgraph/intern/builder/deg_builder.cc
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/makesrna/intern/rna_scene_api.c

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

diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index a5a907c0f79..f39d8006f76 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -107,7 +107,7 @@ static char *blender_version_decimal(const int ver)
 {
 	static char version_str[5];
 	BLI_assert(ver < 1000);
-	BLI_snprintf(version_str, sizeof(version_str),"%d.%02d", ver / 100, ver % 100);
+	BLI_snprintf(version_str, sizeof(version_str), "%d.%02d", ver / 100, ver % 100);
 	return version_str;
 }
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index e6e59689e99..16e9f3d6777 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -3169,7 +3169,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int
 						MPoly *target_poly = cddm->mpoly + *(cddm->pmap[v_target].indices + i_poly);
 
 						if (cddm_poly_compare(cddm->mloop, mp, target_poly, vtargetmap, +1) ||
-							cddm_poly_compare(cddm->mloop, mp, target_poly, vtargetmap, -1))
+						    cddm_poly_compare(cddm->mloop, mp, target_poly, vtargetmap, -1))
 						{
 							found = true;
 							break;
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index a95399562d5..fef0a3bc0ac 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -876,7 +876,7 @@ static void accessor_release_image_callback(libmv_CacheKey cache_key)
 }
 
 static libmv_CacheKey accessor_get_mask_for_track_callback(
-        libmv_FrameAccessorUserData* user_data,
+        libmv_FrameAccessorUserData *user_data,
         int clip_index,
         int frame,
         int track_index,
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c
index 7dc8f3e71c8..3abce7b1d3f 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -160,7 +160,8 @@ static char **get_keys_sorted(GHash *messages, const uint32_t num_keys)
 	return keys;
 }
 
-BLI_INLINE size_t uint32_to_bytes(const int value, char *bytes) {
+BLI_INLINE size_t uint32_to_bytes(const int value, char *bytes)
+{
 	size_t i;
 	for (i = 0; i < sizeof(value); i++) {
 		bytes[i] = (char) ((value >> ((int)i * 8)) & 0xff);
@@ -168,7 +169,8 @@ BLI_INLINE size_t uint32_to_bytes(const int value, char *bytes) {
 	return i;
 }
 
-BLI_INLINE size_t msg_to_bytes(char *msg, char *bytes, uint32_t size) {
+BLI_INLINE size_t msg_to_bytes(char *msg, char *bytes, uint32_t size)
+{
 	/* Note that we also perform replacing of our NULLSEP placeholder by real NULL char... */
 	size_t i;
 	for (i = 0; i < size; i++, msg++, bytes++) {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 086fd0c1144..e3494e4756e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -69,7 +69,7 @@ static bool check_object_needs_evaluation(Object *object)
 
 void deg_graph_build_flush_layers(Depsgraph *graph)
 {
-	BLI_Stack *stack = BLI_stack_new(sizeof(OperationDepsNode*),
+	BLI_Stack *stack = BLI_stack_new(sizeof(OperationDepsNode *),
 	                                 "DEG flush layers stack");
 	foreach (OperationDepsNode *node, graph->operations) {
 		IDDepsNode *id_node = node->owner->owner;
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index b2af2fe1d49..b524119019b 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4758,7 +4758,7 @@ void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
 			float co_curr[2], co_prev[2];
 
 			if ((ED_view3d_project_float_global(ar, fp_prev, co_prev, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) &&
-				(ED_view3d_project_float_global(ar, fp_curr, co_curr, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
+			    (ED_view3d_project_float_global(ar, fp_curr, co_curr, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK))
 			{
 				rv3d->ofs_lock[0] += (co_curr[0] - co_prev[0]) / (ar->winx * 0.5f);
 				rv3d->ofs_lock[1] += (co_curr[1] - co_prev[1]) / (ar->winy * 0.5f);
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index ea7327cfa31..16d91a4964b 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -279,7 +279,7 @@ static void rna_Scene_collada_export(
         int include_shapekeys,
         int deform_bones_only,
         int active_uv_only,
-		int export_texture_type,
+        int export_texture_type,
         int use_texture_copies,
         int triangulate,
         int use_object_instantiation,




More information about the Bf-blender-cvs mailing list