[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49538] trunk/blender/source/blender/ editors/transform: mask transforming when a mesh object was in editmode ( but had no UV's), failed
Campbell Barton
ideasman42 at gmail.com
Fri Aug 3 22:12:50 CEST 2012
Revision: 49538
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49538
Author: campbellbarton
Date: 2012-08-03 20:12:49 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
mask transforming when a mesh object was in editmode (but had no UV's), failed
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-08-03 17:08:45 UTC (rev 49537)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-08-03 20:12:49 UTC (rev 49538)
@@ -175,7 +175,6 @@
if (t->options & CTX_MASK) {
convertViewVec2D_mask(t->view, r_vec, dx, dy);
-
ED_space_image_get_aspect(t->sa->spacedata.first, &aspx, &aspy);
}
else {
Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c 2012-08-03 17:08:45 UTC (rev 49537)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c 2012-08-03 20:12:49 UTC (rev 49538)
@@ -722,7 +722,13 @@
else if (t->spacetype == SPACE_IMAGE) {
float aspx, aspy;
- ED_space_image_get_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
+ if (t->options & CTX_MASK) {
+ /* untested - mask aspect is TODO */
+ ED_space_image_get_aspect(t->sa->spacedata.first, &aspx, &aspy);
+ }
+ else {
+ ED_space_image_get_uv_aspect(t->sa->spacedata.first, &aspx, &aspy);
+ }
glScalef(1.0f / aspx, 1.0f / aspy, 1.0);
}
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c 2012-08-03 17:08:45 UTC (rev 49537)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c 2012-08-03 20:12:49 UTC (rev 49538)
@@ -620,7 +620,10 @@
/* helper for recalcData() - for Image Editor transforms */
static void recalcData_image(TransInfo *t)
{
- if (t->obedit && t->obedit->type == OB_MESH) {
+ if (t->options & CTX_MASK) {
+ recalcData_mask_common(t);
+ }
+ else if (t->obedit && t->obedit->type == OB_MESH) {
SpaceImage *sima = t->sa->spacedata.first;
flushTransUVs(t);
@@ -629,9 +632,6 @@
DAG_id_tag_update(t->obedit->data, 0);
}
- else if (t->options & CTX_MASK) {
- recalcData_mask_common(t);
- }
}
/* helper for recalcData() - for Movie Clip transforms */
@@ -1113,7 +1113,7 @@
t->view = &ar->v2d;
t->around = sima->around;
- if (t->obedit) {
+ if (ED_space_image_show_uvedit(sima, t->obedit)) {
/* UV transform */
}
else if (sima->mode == SI_MODE_MASK) {
@@ -1445,7 +1445,12 @@
if (t->spacetype == SPACE_IMAGE) {
SpaceImage *sima = (SpaceImage *)t->sa->spacedata.first;
/* only space supported right now but may change */
- ED_space_image_get_uv_aspect(sima, &aspx, &aspy);
+ if (t->options & CTX_MASK) {
+ ED_space_image_get_aspect(sima, &aspx, &aspy);
+ }
+ else {
+ ED_space_image_get_uv_aspect(sima, &aspx, &aspy);
+ }
cursor = sima->cursor;
}
More information about the Bf-blender-cvs
mailing list