[Bf-blender-cvs] [3bc0552] master: Fix for running datablock eyedropper outside of a button.

Campbell Barton noreply at git.blender.org
Mon Nov 18 21:12:00 CET 2013


Commit: 3bc0552c5b16bdf1469d64d761ebd0b45e72060b
Author: Campbell Barton
Date:   Tue Nov 19 07:10:56 2013 +1100
http://developer.blender.org/rB3bc0552c5b16bdf1469d64d761ebd0b45e72060b

Fix for running datablock eyedropper outside of a button.

===================================================================

M	source/blender/editors/interface/interface_eyedropper.c

===================================================================

diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 01e53d5..a01c7ee 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);




More information about the Bf-blender-cvs mailing list