[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51960] trunk/blender: style cleanup, also remove redundant call to set_listbasepointers in free_main().

[Campbell Barton]

Revision: 51960
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51960
Author:   campbellbarton
Date:     2012-11-07 01:02:28 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
style cleanup, also remove redundant call to set_listbasepointers in free_main().

Modified Paths:
--------------
    trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/library.c
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/imbuf/intern/colormanagement.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_script.c
    trunk/blender/source/blender/render/intern/source/external_engine.c

Modified: trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
===================================================================
--- trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp	2012-11-07 01:02:28 UTC (rev 51960)
@@ -205,7 +205,7 @@
 	std::vector<MeshSet<3>::mesh_t*>::iterator it = meshes.begin();
 	std::vector< RTreeNode<3, Face<3> *> *> meshRTree;
 
-	while(it != meshes.end()) {
+	while (it != meshes.end()) {
 		MeshSet<3>::mesh_t *mesh = *it;
 		bool isAdded = false;
 
@@ -279,7 +279,7 @@
 		return poly;
 	}
 
-	while(orig_meshes.size()) {
+	while (orig_meshes.size()) {
 		MeshSet<3> *right = Carve_getIntersectedOperand(orig_meshes, otherAABB);
 
 		if (!right) {

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -400,7 +400,8 @@
 	}
 }
 
-static void dag_add_collision_field_relation(DagForest *dag, Scene *scene, Object *ob, DagNode *node, int skip_forcefield){
+static void dag_add_collision_field_relation(DagForest *dag, Scene *scene, Object *ob, DagNode *node, int skip_forcefield)
+{
 	Base *base;
 	DagNode *node2;
 

Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -998,7 +998,6 @@
 #endif
 		}
 	}
-	a = set_listbasepointers(mainvar, lbarray);
 
 	MEM_freeN(mainvar);
 }

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -2267,7 +2267,8 @@
 	}
 }
 
-struct DerivedMesh *smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm){
+struct DerivedMesh *smokeModifier_do(SmokeModifierData *smd, Scene *scene, Object *ob, DerivedMesh *dm)
+{
 	smokeModifier_process(smd, scene, ob, dm);
 
 	/* return generated geometry for adaptive domain */

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -1420,10 +1420,10 @@
 {
 	uiItemR(layout, ptr, "space", 0, "", 0);
 
-	if(RNA_enum_get(ptr, "space") == SHD_NORMAL_MAP_TANGENT) {
+	if (RNA_enum_get(ptr, "space") == SHD_NORMAL_MAP_TANGENT) {
 		PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
 
-		if(obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
+		if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
 			PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
 			uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
 		}
@@ -1442,10 +1442,10 @@
 
 	row = uiLayoutRow(split, FALSE);
 
-	if(RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) {
+	if (RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) {
 		PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
 
-		if(obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
+		if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
 			PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
 			uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
 		}
@@ -1485,7 +1485,7 @@
 	node_shader_buts_script(layout, C, ptr);
 
 	/* not implemented yet
-	if(RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL)
+	if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL)
 		uiItemR(layout, ptr, "use_auto_update", 0, NULL, ICON_NONE);*/
 }
 

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -2385,7 +2385,7 @@
                                        const ColorManagedDisplaySettings *display_settings,
                                        int xmin, int ymin, int xmax, int ymax, int update_orig_byte_buffer)
 {
-	if ((ibuf->rect && ibuf->rect_float) || update_orig_byte_buffer)  {
+	if ((ibuf->rect && ibuf->rect_float) || update_orig_byte_buffer) {
 		/* update byte buffer created by legacy color management */
 
 		unsigned char *rect = (unsigned char *) ibuf->rect;

Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_script.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_script.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_script.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -64,7 +64,7 @@
 	NodeShaderScript *orig_nss = orig_node->storage;
 	NodeShaderScript *new_nss = MEM_dupallocN(orig_nss);
 
-	if(orig_nss->bytecode)
+	if (orig_nss->bytecode)
 		new_nss->bytecode = MEM_dupallocN(orig_nss->bytecode);
 
 	if (orig_nss->prop)

Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c	2012-11-07 01:00:27 UTC (rev 51959)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c	2012-11-07 01:02:28 UTC (rev 51960)
@@ -306,7 +306,7 @@
 
 	if (re)
 		BKE_report(engine->re->reports, type, msg);
-	else if(engine->reports)
+	else if (engine->reports)
 		BKE_report(engine->reports, type, msg);
 }