[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58758] trunk/blender/source/blender/ editors/interface/interface_ops.c: add NULL checks in eyedropper_color_sample_fl since BKE_area_find_region_type may not find a region .

[Campbell Barton]

Revision: 58758
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58758
Author:   campbellbarton
Date:     2013-07-31 09:17:58 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
add NULL checks in eyedropper_color_sample_fl since BKE_area_find_region_type 
may not find a region.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_ops.c

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c      
2013-07-31 08:01:29 UTC (rev 58757)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c      
2013-07-31 09:17:58 UTC (rev 58758)
@@ -148,7 +148,7 @@
                if (BLI_rcti_isect_pt(&sa->totrct, mx, my)) {
                        if (sa->spacetype == SPACE_IMAGE) {
                                ARegion *ar = BKE_area_find_region_type(sa, 
RGN_TYPE_WINDOW);
-                               if (BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
+                               if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, 
my)) {
                                        SpaceImage *sima = sa->spacedata.first;
                                        int mval[2] = {mx - ar->winrct.xmin,
                                                       my - ar->winrct.ymin};
@@ -160,7 +160,7 @@
                        }
                        else if (sa->spacetype == SPACE_NODE) {
                                ARegion *ar = BKE_area_find_region_type(sa, 
RGN_TYPE_WINDOW);
-                               if (BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
+                               if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, 
my)) {
                                        SpaceNode *snode = sa->spacedata.first;
                                        int mval[2] = {mx - ar->winrct.xmin,
                                                       my - ar->winrct.ymin};
@@ -172,7 +172,7 @@
                        }
                        else if (sa->spacetype == SPACE_CLIP) {
                                ARegion *ar = BKE_area_find_region_type(sa, 
RGN_TYPE_WINDOW);
-                               if (BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
+                               if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, 
my)) {
                                        SpaceClip *sc = sa->spacedata.first;
                                        int mval[2] = {mx - ar->winrct.xmin,
                                                       my - ar->winrct.ymin};

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs