[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34374] trunk/blender/source/blender/ editors/space_view3d/view3d_select.c: fix [#25691] Lasso select on 3D Text editing segfaults

[Campbell Barton]

Revision: 34374
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34374
Author:   campbellbarton
Date:     2011-01-17 22:37:24 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
fix [#25691] Lasso select on 3D Text editing segfaults
poll function was incorrect.

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-17 20:10:18 UTC (rev 34373)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2011-01-17 22:37:24 UTC (rev 34374)
@@ -218,16 +218,24 @@
 static int view3d_selectable_data(bContext *C)
 {
 	Object *ob = CTX_data_active_object(C);
-	
+
 	if (!ED_operator_region_view3d_active(C))
 		return 0;
-	
-	if (!CTX_data_edit_object(C))
-		if (ob && ob->mode & OB_MODE_SCULPT)
+
+	if (ob->mode & OB_MODE_EDIT) {
+		if(ob->type == OB_FONT) {
 			return 0;
-		if (ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob))
+		}
+	}
+	else {
+		if (ob && ob->mode & OB_MODE_SCULPT) {
 			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;
 }