kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#35691] Context Override replaces instead of overrides

Browse Source
This commit is contained in:
Campbell Barton 2013-06-10 12:17:36 +00:00
parent c5ba912a3d
commit 31e74d00c1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/context.c
View File

@ -268,9 +268,9 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
memset(result, 0, sizeof(bContextDataResult));
#ifdef WITH_PYTHON
if (CTX_py_dict_get(C)) {
return BPY_context_member_get(C, member, result);
// if (BPY_context_member_get(C, member, result))
// return 1;
if (BPY_context_member_get(C, member, result)) {
return 1;
}
}
#endif

2
source/blender/python/intern/bpy_interface.c
View File

@ -777,7 +777,7 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult *
/* pass */
}
else if (item == Py_None) {
/* pass */
done = true;
}
else if (BPy_StructRNA_Check(item)) {
ptr = &(((BPy_StructRNA *)item)->ptr);