[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52091] trunk/blender/source/blender: style cleanup

Campbell Barton ideasman42 at gmail.com
Sun Nov 11 12:00:56 CET 2012


Revision: 52091
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52091
Author:   campbellbarton
Date:     2012-11-11 11:00:55 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/render/intern/source/external_engine.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-11-11 10:55:32 UTC (rev 52090)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-11-11 11:00:55 UTC (rev 52091)
@@ -2304,9 +2304,9 @@
 	}
 
 	/* Don't remap vertices in cddm->mloop, because we need to know the original
-	   indices in order to skip faces with all vertices merged.
-	   The "update loop indices..." section further down remaps vertices in mloop.
-	*/
+	 * indices in order to skip faces with all vertices merged.
+	 * The "update loop indices..." section further down remaps vertices in mloop.
+	 */
 
 	/* now go through and fix edges and faces */
 	med = cddm->medge;
@@ -2351,8 +2351,7 @@
 				}
 			}
 
-			if (UNLIKELY(all_vertices_merged))
-			{
+			if (UNLIKELY(all_vertices_merged)) {
 				continue;
 			}
 		}

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-11-11 10:55:32 UTC (rev 52090)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-11-11 11:00:55 UTC (rev 52091)
@@ -2384,8 +2384,7 @@
 	(void)oldmarkers;
 #endif
 
-	if ((sequencer_view3d_cb && do_seq_gl && camera) && is_thread_main)
-	{
+	if ((sequencer_view3d_cb && do_seq_gl && camera) && is_thread_main) {
 		char err_out[256] = "unknown";
 		/* for old scened this can be uninitialized,
 		 * should probably be added to do_versions at some point if the functionality stays */

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-11-11 10:55:32 UTC (rev 52090)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-11-11 11:00:55 UTC (rev 52091)
@@ -1140,7 +1140,7 @@
 	bNode *node = (bNode *)ptr->data;
 	RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
 
-	if(engine_type && engine_type->update_script_node) {
+	if (engine_type && engine_type->update_script_node) {
 		/* auto update node */
 		RenderEngine *engine = RE_engine_create(engine_type);
 		engine_type->update_script_node(engine, ntree, node);

Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c	2012-11-11 10:55:32 UTC (rev 52090)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c	2012-11-11 11:00:55 UTC (rev 52091)
@@ -349,7 +349,7 @@
 	re->i.totface = re->i.totvert = re->i.totstrand = re->i.totlamp = re->i.tothalo = 0;
 
 	/* render */
-	if(!re->engine)
+	if (!re->engine)
 		re->engine = RE_engine_create(type);
 
 	engine = re->engine;
@@ -382,7 +382,7 @@
 	if (type->render)
 		type->render(engine, re->scene);
 
-	if(!(re->r.mode & R_PERSISTENT_DATA)) {
+	if (!(re->r.mode & R_PERSISTENT_DATA)) {
 		RE_engine_free(re->engine);
 		re->engine = NULL;
 	}




More information about the Bf-blender-cvs mailing list