fix [#35691] Context Override replaces instead of overrides
authorCampbell Barton <ideasman42@gmail.com>
Mon, 10 Jun 2013 12:17:36 +0000 (12:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 10 Jun 2013 12:17:36 +0000 (12:17 +0000)
source/blender/blenkernel/intern/context.c
source/blender/python/intern/bpy_interface.c

index 428e9d70b9634688d888663409f7da0705238a8c..2a742509635ed13ea8f49d7e116b66313d5417b7 100644 (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
 
index c39168779fd1f6f8dfc311cf3f2a989b10b558ac..79f856344d31129e2a2ce09bfb65e9613d2c513e 100644 (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);