Revision: 24683
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24683
Author: campbellbarton
Date: 2009-11-19 17:15:22 +0100 (Thu, 19 Nov 2009)
Log Message:
-----------
operator properties were not the correct type
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/__init__.py
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/python/intern/bpy_interface.c
Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py 2009-11-19
14:37:07 UTC (rev 24682)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py 2009-11-19
16:15:22 UTC (rev 24683)
@@ -34,6 +34,11 @@
import os
import sys
+# a bit nasty but this prevents help() and input() from locking blender
+# Ideally we could have some way for the console to replace sys.stdin but
+# python would lock blender while waiting for a return value, not easy :|
+sys.stdin = None
+
def load_scripts(reload_scripts=False):
import traceback
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2009-11-19
14:37:07 UTC (rev 24682)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2009-11-19
16:15:22 UTC (rev 24683)
@@ -302,7 +302,7 @@
static PointerRNA rna_Operator_properties_get(PointerRNA *ptr)
{
wmOperator *op= (wmOperator*)ptr->data;
- return rna_pointer_inherit_refine(ptr, &RNA_OperatorProperties,
op->properties);
+ return rna_pointer_inherit_refine(ptr, op->type->srna, op->properties);
}
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2009-11-19
14:37:07 UTC (rev 24682)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2009-11-19
16:15:22 UTC (rev 24683)
@@ -345,11 +345,6 @@
PyObject *d = PyEval_GetBuiltins( );
PyDict_SetItemString(d, "reload",
item=PyCFunction_New(bpy_reload_meth, NULL)); Py_DECREF(item);
PyDict_SetItemString(d, "__import__",
item=PyCFunction_New(bpy_import_meth, NULL)); Py_DECREF(item);
-
- /* a bit nasty but this prevents help() and input() from
locking blender
- * Ideally we could have some way for the console to replace
sys.stdin but
- * python would lock blender while waiting for a return value,
not easy :| */
- PySys_SetObject("stdin", Py_None);
}
pyrna_alloc_types();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
