[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34388] trunk/blender/source/blender/ editors/space_view3d/view3d_select.c: Bugfix, irc report: general view3d operator poll() was reading NULL

[Ton Roosendaal]

Revision: 34388
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34388
Author:   ton
Date:     2011-01-18 14:34:59 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Bugfix, irc report: general view3d operator poll() was reading NULL
caused by commit for fix [#25691] 16 hours ago.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2011-01-18 13:28:18 UTC (rev 34387)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2011-01-18 14:34:59 UTC (rev 34388)
@@ -222,18 +222,20 @@
 	if (!ED_operator_region_view3d_active(C))
 		return 0;
 
-	if (ob->mode & OB_MODE_EDIT) {
-		if(ob->type == OB_FONT) {
-			return 0;
+	if(ob) {
+		if (ob->mode & OB_MODE_EDIT) {
+			if(ob->type == OB_FONT) {
+				return 0;
+			}
 		}
-	}
-	else {
-		if (ob && ob->mode & OB_MODE_SCULPT) {
-			return 0;
+		else {
+			if (ob->mode & OB_MODE_SCULPT) {
+				return 0;
+			}
+			if (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) {
+				return 0;
+			}
 		}
-		if (ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob)) {
-			return 0;
-		}
 	}
 
 	return 1;