archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T42932: Drag&Drop of groups from the outliner was using undefined

Browse Source 
event->mval.

Calculating from event->x/y like object drag/drop does works. Also fixed
a missing notifier of the object instancing operator.
This commit is contained in:
Lukas Tönne
2014-12-17 13:47:14 +01:00
parent a56e31c89c
commit cd4d5dcb46
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/object/object_add.c
View File

@@ -977,8 +977,11 @@ static int group_instance_add_exec(bContext *C, wmOperator *op)
if (0 == RNA_struct_property_is_set(op->ptr, "location")) { if (0 == RNA_struct_property_is_set(op->ptr, "location")) {
wmEvent *event = CTX_wm_window(C)->eventstate; 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_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); RNA_float_set_array(op->ptr, "location", loc);
} }
} }
@@ -2309,7 +2312,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
MEM_freeN(base); 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; return OPERATOR_FINISHED;
} }