[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54902] trunk/blender/source/blender/ editors/space_view3d: changing image dropping into the viewport to add empty objects ( from r54825) wasnt such a popular move,
Campbell Barton
ideasman42 at gmail.com
Wed Feb 27 11:14:36 CET 2013
Revision: 54902
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54902
Author: campbellbarton
Date: 2013-02-27 10:14:36 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
changing image dropping into the viewport to add empty objects (from r54825) wasnt such a popular move,
reinstate old behavior, holding Ctrl now adds empty objects instead.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54825
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2013-02-27 09:58:40 UTC (rev 54901)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c 2013-02-27 10:14:36 UTC (rev 54902)
@@ -513,13 +513,28 @@
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 @@
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);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-02-27 09:58:40 UTC (rev 54901)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-02-27 10:14:36 UTC (rev 54902)
@@ -3699,7 +3699,7 @@
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";
More information about the Bf-blender-cvs
mailing list