diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-01-04 17:37:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-04 17:46:13 +0300 |
| commit | 66123ef3adee953e26c4cea24c77b0224c92e402 (patch) | |
| tree | 63bfd81d61205235499704a896fd45e2c7b0925c /source/blender | |
| parent | 474aa8515dd5b5f448b2de2cd3f0c98d83fe15c3 (diff) | |
Cleanup
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 8 |
4 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 736b2f69442..4403949274a 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 d4afc6c11b5..8781b468791 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 1ac18858f56..cd318e4b105 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 cda1fc708c2..45a57352376 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 |