style cleanup, also remove redundant call to set_listbasepointers in free_main().

7 files changed, 12 insertions, 11 deletions

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 950a0ca3d60..44b3917df7f 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -400,7 +400,8 @@ static void dag_add_material_driver_relations(DagForest *dag, DagNode *node, Mat
 	}
 }
 
-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;
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 942e71b5052..9deff12f124 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -998,7 +998,6 @@ void free_main(Main *mainvar)
 #endif
 		}
 	}
-	a = set_listbasepointers(mainvar, lbarray);
 
 	MEM_freeN(mainvar);
 }
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 443aed1fc41..f9925a41177 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2267,7 +2267,8 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 	}
 }
 
-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 */
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index f051148109a..43dadb18a81 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -1420,10 +1420,10 @@ static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRN
 {
 	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 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *
 
 	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 @@ static void node_shader_buts_script_details(uiLayout *layout, bContext *C, Point
 	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);*/
 }
 
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 6581987aed7..aadf547260d 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -2385,7 +2385,7 @@ void IMB_partial_display_buffer_update(ImBuf *ibuf, const float *linear_buffer,
                                        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;
diff --git a/source/blender/nodes/shader/nodes/node_shader_script.c b/source/blender/nodes/shader/nodes/node_shader_script.c
index d4c2d188ffa..b5563658a64 100644
--- a/source/blender/nodes/shader/nodes/node_shader_script.c
+++ b/source/blender/nodes/shader/nodes/node_shader_script.c
@@ -64,7 +64,7 @@ static void node_copy_script(bNode *orig_node, bNode *new_node)
 	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)
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 4ec19fa729f..e2f347c05f1 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -306,7 +306,7 @@ void RE_engine_report(RenderEngine *engine, int type, const char *msg)
 
 	if (re)
 		BKE_report(engine->re->reports, type, msg);
-	else if(engine->reports)
+	else if (engine->reports)
 		BKE_report(engine->reports, type, msg);
 }