bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Campbell Barton 2016-01-05 01:37:03 +11:00
parent 474aa8515d
commit 66123ef3ad
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/library.c
View 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);
}

2
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -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)
{

2
source/blender/modifiers/intern/MOD_explode.c
View 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 ||

8
source/blender/python/intern/bpy_rna.c
View 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