Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-26 22:06:01 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-26 22:06:01 +0300
commitb7405ce98f1a97226735aff9a3b78a96ec9f5fac (patch)
tree832b87b2b9df22b2ca00fbb71641622e1a32187b /source/blender/editors/space_view3d/space_view3d.c
parentb119ce5fcc91466c6aeb1232e8bf4dca401adaed (diff)
Fix for dropping objects in 3d view, need to set property in
sub operator in macro.
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
-rw-r--r--source/blender/editors/space_view3d/space_view3d.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index da64c10b277..d93414b4b6e 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -428,7 +428,14 @@ static int view3d_ima_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
static void view3d_id_drop_copy(wmDrag *drag, wmDropBox *drop)
{
ID *id= (ID *)drag->poin;
- RNA_string_set(drop->ptr, "name", id->name+2);
+ PointerRNA ptr;
+
+ /* need to put name in sub-operator in macro */
+ ptr= RNA_pointer_get(drop->ptr, "OBJECT_OT_add_named");
+ if(ptr.data)
+ RNA_string_set(&ptr, "name", id->name+2);
+ else
+ RNA_string_set(drop->ptr, "name", id->name+2);
}
/* region dropbox definition */