operator properties were not the correct type

2 files changed, 1 insertions, 6 deletions

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 32308b456fc..3233c1d8443 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -302,7 +302,7 @@ static int rna_Operator_name_length(PointerRNA *ptr)
 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);
 }
 
 
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 71fb88fc12e..55dc133dfcb 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -345,11 +345,6 @@ void BPY_start_python( int argc, char **argv )
 		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();