[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55597] trunk/blender/source/blender/ editors/transform: Better fix for "To Sphere" crashing in Image editor.

[Ton Roosendaal]

Revision: 55597
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55597
Author:   ton
Date:     2013-03-26 10:28:19 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
Better fix for "To Sphere" crashing in Image editor. It appeared to be in use for
mask/uv modes. 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_generics.c
    trunk/blender/source/blender/editors/transform/transform_ops.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-03-26 09:59:43 UTC (rev 55596)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-03-26 10:28:19 UTC (rev 55597)
@@ -6469,7 +6469,7 @@
 				sort_trans_data_dist(t);
 			}
 		}
-		else {
+		else if (t->obedit) {
 			createTransUVs(C, t);
 			if (t->data && (t->flag & T_PROP_EDIT)) {
 				sort_trans_data(t); // makes selected become first in array

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2013-03-26 09:59:43 UTC (rev 55596)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2013-03-26 10:28:19 UTC (rev 55597)
@@ -1160,7 +1160,7 @@
 			t->options |= CTX_MASK;
 		}
 		else {
-			BLI_assert(0);
+			/* image not in uv edit, nor in mask mode, can happen for some tools */
 		}
 	}
 	else if (t->spacetype == SPACE_NODE) {

Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c	2013-03-26 09:59:43 UTC (rev 55596)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c	2013-03-26 10:28:19 UTC (rev 55597)
@@ -721,7 +721,7 @@
 	ot->exec   = transform_exec;
 	ot->modal  = transform_modal;
 	ot->cancel = transform_cancel;
-	ot->poll   = ED_operator_view3d_active;
+	ot->poll   = ED_operator_screenactive;
 
 	RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1);