[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54368] trunk/blender/source: fix for regression in bpy-api, python context passed to operators couldn' t override collections.

Campbell Barton ideasman42 at gmail.com
Thu Feb 7 05:04:13 CET 2013


Revision: 54368
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54368
Author:   campbellbarton
Date:     2013-02-07 04:04:12 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
fix for regression in bpy-api, python context passed to operators couldn't override collections.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_interface.c
    trunk/blender/source/tests/batch_import.py

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2013-02-07 04:02:24 UTC (rev 54367)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2013-02-07 04:04:12 UTC (rev 54368)
@@ -765,6 +765,7 @@
 
 		//result->ptr = ((BPy_StructRNA *)item)->ptr;
 		CTX_data_pointer_set(result, ptr->id.data, ptr->type, ptr->data);
+		CTX_data_type_set(result, CTX_DATA_TYPE_POINTER);
 		done = true;
 	}
 	else if (PySequence_Check(item)) {
@@ -795,12 +796,12 @@
 
 			}
 			Py_DECREF(seq_fast);
-
+			CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
 			done = true;
 		}
 	}
 
-	if (done == 0) {
+	if (done == false) {
 		if (item) printf("PyContext '%s' not a valid type\n", member);
 		else      printf("PyContext '%s' not found\n", member);
 	}

Modified: trunk/blender/source/tests/batch_import.py
===================================================================
--- trunk/blender/source/tests/batch_import.py	2013-02-07 04:02:24 UTC (rev 54367)
+++ trunk/blender/source/tests/batch_import.py	2013-02-07 04:04:12 UTC (rev 54368)
@@ -134,8 +134,7 @@
             print("\tSaving: %r" % fout_blend)
 
             fout_dir = os.path.dirname(fout_blend)
-            if not os.path.exists(fout_dir):
-                os.makedirs(fout_dir)
+            os.makedirs(fout_dir, exist_ok=True)
 
             bpy.ops.wm.save_as_mainfile(filepath=fout_blend)
 




More information about the Bf-blender-cvs mailing list