diff --git a/release/scripts/modules/bpy_ops.py b/release/scripts/modules/bpy_ops.py index 8b5d07b3986..3eeb7f55400 100644 --- a/release/scripts/modules/bpy_ops.py +++ b/release/scripts/modules/bpy_ops.py @@ -364,6 +364,7 @@ class WM_OT_doc_edit(bpy.types.Operator): __label__ = "Edit Documentation" __props__ = [doc_id, doc_new] + def _send_xmlrpc(self, data_dict): print("sending data:", data_dict) diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index f2022cb490f..c8c8d5628ed 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -123,10 +123,8 @@ void ED_object_base_init_from_view(bContext *C, Base *base) } if (U.flag & USER_ADD_VIEWALIGNED) { - ARegion *ar= CTX_wm_region(C); - if(ar) { - RegionView3D *rv3d= ar->regiondata; - + RegionView3D *rv3d = CTX_wm_region_view3d(C); + if(rv3d) { rv3d->viewquat[0]= -rv3d->viewquat[0]; QuatToEul(rv3d->viewquat, ob->rot); rv3d->viewquat[0]= -rv3d->viewquat[0]; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index a60de529e8f..b067d30e36e 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1178,7 +1178,6 @@ static PyObject *pyrna_struct_is_property_hidden(BPy_StructRNA * self, PyObject return PyBool_FromLong(hidden); } - static PyObject *pyrna_struct_dir(BPy_StructRNA * self) { PyObject *ret, *dict; @@ -1263,6 +1262,13 @@ static PyObject *pyrna_struct_dir(BPy_StructRNA * self) BLI_freelistN(&lb); } + /* Hard coded names */ + { + pystring = PyUnicode_FromString("id_data"); + PyList_Append(ret, pystring); + Py_DECREF(pystring); + } + return ret; } @@ -1319,6 +1325,16 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA * self, PyObject *pyname ) BLI_freelistN(&newlb); } + else if (strcmp(name, "id_data")==0) { /* XXX - hard coded */ + if(self->ptr.id.data) { + PointerRNA id_ptr; + RNA_id_pointer_create((ID *)self->ptr.id.data, &id_ptr); + return pyrna_struct_CreatePyObject(&id_ptr); + } + else { + Py_RETURN_NONE; + } + } else { PyErr_Format( PyExc_AttributeError, "StructRNA - Attribute \"%.200s\" not found", name); ret = NULL;