diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-07-24 17:18:49 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-07-24 17:18:49 +0400 |
| commit | 36b6b691733c7c1683d0326a3b0ba80e98b221ff (patch) | |
| tree | 07253ddb156bba11bf143849b4f4fdd66801bd60 /source/blender/editors/interface/interface_handlers.c | |
| parent | b7b1c09766a120cdb1f66a40a93590c2dcfe1120 (diff) | |
Fixes:
* Crash with image drag'n'drop
* Drag'n drop color to paint 2d canvas not working
* Change "Layers" to "Slots" to appease purists.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index a26c8dbe81d..b3f13ccdb35 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6435,10 +6435,13 @@ bool UI_but_active_drop_name(bContext *C) bool UI_but_active_drop_color(bContext *C) { ARegion *ar = CTX_wm_region(C); - uiBut *but = ui_but_find_activated(ar); - if (but && but->type == COLOR) - return true; + if (ar) { + uiBut *but = ui_but_find_activated(ar); + + if (but && but->type == COLOR) + return true; + } return false; } |