diff options
author | Ton Roosendaal <ton@blender.org> | 2013-03-26 14:28:19 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-03-26 14:28:19 +0400 |
commit | 6e076c41641ff5a8bbb8377b1d1bf73c128ea195 (patch) | |
tree | f160b1d3901074ec408e6c0de3345a433141c1b4 /source/blender | |
parent | f1ed223e34e61777af46d33e5bfc2fc03223a689 (diff) |
Better fix for "To Sphere" crashing in Image editor. It appeared to be in use for
mask/uv modes.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_ops.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index cf960c953c3..f84c967711c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6469,7 +6469,7 @@ void createTransData(bContext *C, TransInfo *t) 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 diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 2a3b0bc8726..3d3b8009c99 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1160,7 +1160,7 @@ int initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *even 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) { diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 778795bb3a1..60b0c655691 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -721,7 +721,7 @@ static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) 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); |