forked from bartvdbraak/blender
fix [#35691] Context Override replaces instead of overrides
This commit is contained in:
parent
c5ba912a3d
commit
31e74d00c1
@ -268,9 +268,9 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
|
|||||||
memset(result, 0, sizeof(bContextDataResult));
|
memset(result, 0, sizeof(bContextDataResult));
|
||||||
#ifdef WITH_PYTHON
|
#ifdef WITH_PYTHON
|
||||||
if (CTX_py_dict_get(C)) {
|
if (CTX_py_dict_get(C)) {
|
||||||
return BPY_context_member_get(C, member, result);
|
if (BPY_context_member_get(C, member, result)) {
|
||||||
// if (BPY_context_member_get(C, member, result))
|
return 1;
|
||||||
// return 1;
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -777,7 +777,7 @@ int BPY_context_member_get(bContext *C, const char *member, bContextDataResult *
|
|||||||
/* pass */
|
/* pass */
|
||||||
}
|
}
|
||||||
else if (item == Py_None) {
|
else if (item == Py_None) {
|
||||||
/* pass */
|
done = true;
|
||||||
}
|
}
|
||||||
else if (BPy_StructRNA_Check(item)) {
|
else if (BPy_StructRNA_Check(item)) {
|
||||||
ptr = &(((BPy_StructRNA *)item)->ptr);
|
ptr = &(((BPy_StructRNA *)item)->ptr);
|
||||||
|
Loading…
Reference in New Issue
Block a user