[Bf-blender-cvs] [66123ef] master: Cleanup

[Campbell Barton]

Commit: 66123ef3adee953e26c4cea24c77b0224c92e402
Author: Campbell Barton
Date:   Tue Jan 5 01:37:03 2016 +1100
Branches: master
https://developer.blender.org/rB66123ef3adee953e26c4cea24c77b0224c92e402

Cleanup

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

M	source/blender/blenkernel/intern/library.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/modifiers/intern/MOD_explode.c
M	source/blender/python/intern/bpy_rna.c

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

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 736b2f6..4403949 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1799,7 +1799,7 @@ void BKE_library_make_local(Main *bmain, Library *lib, bool untagged_only, bool
 				}
 
 				if (set_fake) {
-					if (!ELEM( GS(id->name), ID_OB, ID_GR)) {
+					if (!ELEM(GS(id->name), ID_OB, ID_GR)) {
 						/* do not set fake user on objects, groups (instancing) */
 						id_fake_user_set(id);
 					}
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d4afc6c..8781b46 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -106,8 +106,6 @@
 #if defined(__APPLE__) && defined _OPENMP
 #include <sys/sysctl.h>
 
-#include "BLI_threads.h"
-
 /* Query how many cores not counting HT aka physical cores we've got. */
 static int system_physical_thread_count(void)
 {
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 1ac1885..cd318e4 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -1006,7 +1006,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 		if (psys == NULL || psys->totpart == 0) return derivedData;
 		if (psys->part == NULL || psys->particles == NULL) return derivedData;
-		if (psmd->dm_final== NULL) return derivedData;
+		if (psmd->dm_final == NULL) return derivedData;
 
 		/* 1. find faces to be exploded if needed */
 		if (emd->facepa == NULL ||
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index cda1fc7..45a5735 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1318,10 +1318,10 @@ static PyObject *pyrna_enum_to_py(PointerRNA *ptr, PropertyRNA *prop, int val)
 #if 0				/* gives python decoding errors while generating docs :( */
 					char error_str[256];
 					BLI_snprintf(error_str, sizeof(error_str),
-								 "RNA Warning: Current value \"%d\" "
-								 "matches no enum in '%s', '%s', '%s'",
-								 val, RNA_struct_identifier(ptr->type),
-								 ptr_name, RNA_property_identifier(prop));
+					             "RNA Warning: Current value \"%d\" "
+					             "matches no enum in '%s', '%s', '%s'",
+					             val, RNA_struct_identifier(ptr->type),
+					             ptr_name, RNA_property_identifier(prop));
 
 					PyErr_Warn(PyExc_RuntimeWarning, error_str);
 #endif