Cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jan 2016 14:37:03 +0000 (01:37 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Jan 2016 14:46:13 +0000 (01:46 +1100)
source/blender/blenkernel/intern/library.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/python/intern/bpy_rna.c

index 736b2f69442a657889a657ab844f566731d33f66..4403949274a56570dbc6cec65f3c2d6c93f526ee 100644 (file)
@@ -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);
                                        }
index d4afc6c11b5641a013b0d592fcb833c5af171f98..8781b468791e024332207cbd090f932f9c797dce 100644 (file)
 #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)
 {
index 1ac18858f56769bf1ca934100bb4471fb1b5fb44..cd318e4b105481b99145d72af97165e7fbbf69e9 100644 (file)
@@ -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 ||
index cda1fc708c2046c6983d382db587e5f5a690e17e..45a573523764331a01ea3e35052d9c7a30a521fd 100644 (file)
@@ -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