[Bf-blender-cvs] [f28376d8d93] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Sun Mar 12 18:39:30 CET 2017


Commit: f28376d8d938fed33ea6c53d745ec343ac3c2b5d
Author: Campbell Barton
Date:   Mon Mar 13 04:25:21 2017 +1100
Branches: master
https://developer.blender.org/rBf28376d8d938fed33ea6c53d745ec343ac3c2b5d

Cleanup: style

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

M	source/blender/alembic/intern/abc_exporter.cc
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/blenkernel/intern/tracking_stabilize.c
M	source/blender/blenkernel/intern/writeffmpeg.c
M	source/blender/bmesh/intern/bmesh_core.c
M	source/blender/render/intern/source/shadeoutput.c

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

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 90a99469389..61e7712150f 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -347,7 +347,7 @@ void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx)
 		Object *ob = base->object;
 
 		if (export_object(&m_settings, ob)) {
-			switch(ob->type) {
+			switch (ob->type) {
 				case OB_LAMP:
 				case OB_LATTICE:
 				case OB_MBALL:
@@ -533,7 +533,7 @@ void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
 		}
 	}
 
-	switch(ob->type) {
+	switch (ob->type) {
 		case OB_MESH:
 		{
 			Mesh *me = static_cast<Mesh *>(ob->data);
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index b0671f33094..54cfae620a1 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -67,7 +67,7 @@
 
 #include "BKE_deform.h"
 
-/* Workaround for cyclic depenndnecy with curves.
+/* Workaround for cyclic dependency with curves.
  * In such case curve_cache might not be ready yet,
  */
 #define CYCLIC_DEPENDENCY_WORKAROUND
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index 722fc89a75f..3dfaa1ed77d 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -755,7 +755,8 @@ static void average_marker_positions(StabContext *ctx, int framenr, float r_ref_
 	if (ok) {
 		r_ref_pos[0] /= weight_sum;
 		r_ref_pos[1] /= weight_sum;
-	} else {
+	}
+	else {
 		/* No usable tracking data on any track on this frame.
 		 * Use data from neighbouring frames to extrapolate...
 		 */
@@ -784,7 +785,8 @@ static void average_marker_positions(StabContext *ctx, int framenr, float r_ref_
 			 * Also default to this frame when we're in a gap */
 			average_marker_positions(ctx, next_lower, r_ref_pos);
 
-		} else if (next_higher < MAXFRAME) {
+		}
+		else if (next_higher < MAXFRAME) {
 			average_marker_positions(ctx, next_higher, r_ref_pos);
 		}
 		use_values_from_fcurves(ctx, false);
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 9994d479ce7..156b74f5c3d 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -568,7 +568,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
 
 	if (context->ffmpeg_crf >= 0) {
 		ffmpeg_dict_set_int(&opts, "crf", context->ffmpeg_crf);
-	} else {
+	}
+	else {
 		c->bit_rate = context->ffmpeg_video_bitrate * 1000;
 		c->rc_max_rate = rd->ffcodecdata.rc_max_rate * 1000;
 		c->rc_min_rate = rd->ffcodecdata.rc_min_rate * 1000;
@@ -576,8 +577,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
 	}
 
 	if (context->ffmpeg_preset) {
-		char const * preset_name;
-		switch(context->ffmpeg_preset) {
+		char const *preset_name;
+		switch (context->ffmpeg_preset) {
 			case FFM_PRESET_ULTRAFAST: preset_name = "ultrafast"; break;
 			case FFM_PRESET_SUPERFAST: preset_name = "superfast"; break;
 			case FFM_PRESET_VERYFAST: preset_name = "veryfast"; break;
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 68cacf55efe..b075d508295 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -2756,7 +2756,8 @@ BMVert *bmesh_urmv_loop_multi(
 				}
 
 				STACK_PUSH(edges, e_iter);
-			} else {
+			}
+			else {
 				/* at least one edge attached isn't connected to our loops */
 				is_mixed_edge_any = true;
 			}
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index c4de95e863e..a8fb72fb7f8 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -2143,7 +2143,7 @@ const float (*RE_object_instance_get_matrix(struct ObjectInstanceRen *obi, int m
 
 const float (*RE_render_current_get_matrix(int matrix_id))[4]
 {
-	switch(matrix_id) {
+	switch (matrix_id) {
 		case RE_VIEW_MATRIX:
 			return (const float(*)[4])R.viewmat;
 		case RE_VIEWINV_MATRIX:
@@ -2171,4 +2171,4 @@ float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta)
 	}
 
 	return result;
-}
\ No newline at end of file
+}




More information about the Bf-blender-cvs mailing list