diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-27 13:15:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-27 13:15:43 +0300 |
| commit | eb62d47ff4b2e3f9dd84b22084b5f86c4ccb939f (patch) | |
| tree | 79119b108cc6508aaa52f5653097c28825fe7674 /source/blender | |
| parent | e7cb4d2a0d2a9ef39eed90c44b893d11cef74f26 (diff) | |
Fix own commit: broke add background image
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 20488e58d7d..91743adf2e9 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; |