kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

changing image dropping into the viewport to add empty objects (from r54825) wasnt such a popular move,

Browse Source 
reinstate old behavior, holding Ctrl now adds empty objects instead.
This commit is contained in:
Campbell Barton 2013-02-27 10:14:36 +00:00
parent fefc684036
commit 7eeb915e8d
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/space_view3d/space_view3d.c
View File

@ -513,13 +513,28 @@ static int view3d_ima_drop_poll(bContext *UNUSED(C), wmDrag *drag, wmEvent *UNUS
return 0;
}
static int view3d_ima_bg_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
{
if (event->ctrl)
return false;
if (!ED_view3d_give_base_under_cursor(C, event->mval)) {
return view3d_ima_drop_poll(C, drag, event);
}
return 0;
}
static int view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
{
Base *base = ED_view3d_give_base_under_cursor(C, event->mval);
Base *base;
if (!base || (base && base->object->type == OB_EMPTY))
if (!event->ctrl)
return false;
base = ED_view3d_give_base_under_cursor(C, event->mval);
if (!base || (base && base->object->type == OB_EMPTY)) {
return view3d_ima_drop_poll(C, drag, event);
}
return 0;
}
@ -574,6 +589,7 @@ static void view3d_dropboxes(void)
WM_dropbox_add(lb, "OBJECT_OT_drop_named_material", view3d_mat_drop_poll, view3d_id_drop_copy);
WM_dropbox_add(lb, "MESH_OT_drop_named_image", view3d_ima_mesh_drop_poll, view3d_id_path_drop_copy);
WM_dropbox_add(lb, "OBJECT_OT_drop_named_image", view3d_ima_empty_drop_poll, view3d_id_path_drop_copy);
WM_dropbox_add(lb, "VIEW3D_OT_background_image_add", view3d_ima_bg_drop_poll, view3d_id_path_drop_copy);
WM_dropbox_add(lb, "OBJECT_OT_group_instance_add", view3d_group_drop_poll, view3d_group_drop_copy);
}

2
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -3699,7 +3699,7 @@ static int background_image_add_invoke(bContext *C, wmOperator *op, wmEvent *UNU
void VIEW3D_OT_background_image_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Background Image";
ot->name = "Add Background Image (Ctrl for Empty Object)";
ot->description = "Add a new background image";
ot->idname = "VIEW3D_OT_background_image_add";