Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-11-19 00:10:56 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-19 00:10:56 +0400
commit3bc0552c5b16bdf1469d64d761ebd0b45e72060b (patch)
tree16913c40259deca9ce58004a0792d9fd1eec21b7 /source/blender/editors
parentbea9c3ab30b5946d84298bc6fd85d38ed4a6802f (diff)
Fix for running datablock eyedropper outside of a button.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_eyedropper.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 01e53d5e721..a01c7eecda1 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -439,7 +439,9 @@ static void datadropper_exit(bContext *C, wmOperator *op)
if (op->customdata) {
DataDropper *ddr = (DataDropper *)op->customdata;
- ED_region_draw_cb_exit(ddr->art, ddr->draw_handle_pixel);
+ if (ddr->art) {
+ ED_region_draw_cb_exit(ddr->art, ddr->draw_handle_pixel);
+ }
MEM_freeN(op->customdata);