Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1592)

Unified Diff: source/blender/editors/space_view3d/space_view3d.c

Issue 7416049: Freestyle r54826 branch review Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- source/blender/editors/space_view3d/space_view3d.c (revision 54826)
+++ source/blender/editors/space_view3d/space_view3d.c (working copy)
@@ -514,21 +514,19 @@
}
-static int view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+static int view3d_ima_bg_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
{
- Base *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);
+ if (ED_view3d_give_base_under_cursor(C, event->mval) ) {
return 0;
}
+ return view3d_ima_drop_poll(C, drag, event);
+}
-static int view3d_ima_mesh_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+static int view3d_ima_ob_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
{
- Base *base = ED_view3d_give_base_under_cursor(C, event->mval);
-
- if (base && base->object->type == OB_MESH)
+ if (ED_view3d_give_base_under_cursor(C, event->mval) ) {
return view3d_ima_drop_poll(C, drag, event);
+ }
return 0;
}
@@ -572,8 +570,8 @@
WM_dropbox_add(lb, "OBJECT_OT_add_named", view3d_ob_drop_poll, view3d_ob_drop_copy);
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, "MESH_OT_drop_named_image", view3d_ima_ob_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);
}

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b