forked from bartvdbraak/blender
operator properties were not the correct type
This commit is contained in:
parent
fc502cf481
commit
3f10b91235
@ -34,6 +34,11 @@ ops = ops_module.ops_fake_module
|
|||||||
import os
|
import os
|
||||||
import sys
|
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):
|
def load_scripts(reload_scripts=False):
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
|
@ -302,7 +302,7 @@ static int rna_Operator_name_length(PointerRNA *ptr)
|
|||||||
static PointerRNA rna_Operator_properties_get(PointerRNA *ptr)
|
static PointerRNA rna_Operator_properties_get(PointerRNA *ptr)
|
||||||
{
|
{
|
||||||
wmOperator *op= (wmOperator*)ptr->data;
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -345,11 +345,6 @@ void BPY_start_python( int argc, char **argv )
|
|||||||
PyObject *d = PyEval_GetBuiltins( );
|
PyObject *d = PyEval_GetBuiltins( );
|
||||||
PyDict_SetItemString(d, "reload", item=PyCFunction_New(bpy_reload_meth, NULL)); Py_DECREF(item);
|
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);
|
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();
|
pyrna_alloc_types();
|
||||||
|
Loading…
Reference in New Issue
Block a user