[Bf-blender-cvs] [eb62d47] master: Fix own commit: broke add background image
Campbell Barton
noreply at git.blender.org
Thu Nov 27 11:18:22 CET 2014
Commit: eb62d47ff4b2e3f9dd84b22084b5f86c4ccb939f
Author: Campbell Barton
Date: Thu Nov 27 11:15:43 2014 +0100
Branches: master
https://developer.blender.org/rBeb62d47ff4b2e3f9dd84b22084b5f86c4ccb939f
Fix own commit: broke add background image
===================================================================
M source/blender/editors/space_view3d/view3d_edit.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 20488e5..91743ad 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4341,13 +4341,11 @@ static int background_image_add_exec(bContext *C, wmOperator *UNUSED(op))
static int background_image_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
View3D *v3d = CTX_wm_view3d(C);
- Image *ima = NULL;
+ Image *ima;
BGpic *bgpic;
ima = (Image *)WM_operator_drop_load_path(C, op, ID_IM);
- if (!ima) {
- return OPERATOR_CANCELLED;
- }
+ /* may be NULL, continue anyway */
bgpic = background_image_add(C);
bgpic->ima = ima;
More information about the Bf-blender-cvs
mailing list