Commit: cd4d5dcb468a710ea0c688c884379d25c5d6bd66
Author: Lukas Tönne
Date: Wed Dec 17 13:47:14 2014 +0100
Branches: master
https://developer.blender.org/rBcd4d5dcb468a710ea0c688c884379d25c5d6bd66
Fix T42932: Drag&Drop of groups from the outliner was using undefined
event->mval.
Calculating from event->x/y like object drag/drop does works. Also fixed
a missing notifier of the object instancing operator.
===================================================================
M source/blender/editors/object/object_add.c
===================================================================
diff --git a/source/blender/editors/object/object_add.c
b/source/blender/editors/object/object_add.c
index 8ab9feb..c3edd63 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -977,8 +977,11 @@ static int group_instance_add_exec(bContext *C, wmOperator
*op)
if (0 == RNA_struct_property_is_set(op->ptr, "location")) {
wmEvent *event = CTX_wm_window(C)->eventstate;
+ ARegion *ar = CTX_wm_region(C);
+ const int mval[2] = {event->x - ar->winrct.xmin,
+ event->y - ar->winrct.ymin};
ED_object_location_from_view(C, loc);
- ED_view3d_cursor3d_position(C, loc, event->mval);
+ ED_view3d_cursor3d_position(C, loc, mval);
RNA_float_set_array(op->ptr, "location", loc);
}
}
@@ -2309,7 +2312,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
MEM_freeN(base);
- WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT | ND_OB_ACTIVE, scene);
return OPERATOR_FINISHED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
