[Bf-blender-cvs] [df50104e1c7] master: Fix T77068: UV Proportional Edit "Connected Only" option affects UV clipping (even if the proportional edit itself is disabled)

Philipp Oeser noreply at git.blender.org
Wed Jun 10 11:04:59 CEST 2020


Commit: df50104e1c75e73d93113f71b9c1226738a35169
Author: Philipp Oeser
Date:   Thu Jun 4 11:57:33 2020 +0200
Branches: master
https://developer.blender.org/rBdf50104e1c75e73d93113f71b9c1226738a35169

Fix T77068: UV Proportional Edit "Connected Only" option affects UV
clipping (even if the proportional edit itself is disabled)

Checking T_PROP_EDIT_ALL returns true for _any_ of the options, so just
check for T_PROP_EDIT.

Note: this might expand to other similar checks (e.g. header text)

Maniphest Tasks: T77068

Differential Revision: https://developer.blender.org/D7927

===================================================================

M	source/blender/editors/transform/transform_mode_resize.c
M	source/blender/editors/transform/transform_mode_translate.c

===================================================================

diff --git a/source/blender/editors/transform/transform_mode_resize.c b/source/blender/editors/transform/transform_mode_resize.c
index d919d5c889d..ebce32a598e 100644
--- a/source/blender/editors/transform/transform_mode_resize.c
+++ b/source/blender/editors/transform/transform_mode_resize.c
@@ -119,7 +119,7 @@ static void applyResize(TransInfo *t, const int UNUSED(mval[2]))
       /* vertices in the radius of the brush end */
       /* outside the clipping area               */
       /* XXX HACK - dg */
-      if (t->flag & T_PROP_EDIT_ALL) {
+      if (t->flag & T_PROP_EDIT) {
         clipUVData(t);
       }
     }
diff --git a/source/blender/editors/transform/transform_mode_translate.c b/source/blender/editors/transform/transform_mode_translate.c
index 96820ca6385..60caa257a40 100644
--- a/source/blender/editors/transform/transform_mode_translate.c
+++ b/source/blender/editors/transform/transform_mode_translate.c
@@ -352,7 +352,7 @@ static void applyTranslation(TransInfo *t, const int UNUSED(mval[2]))
     /* vertices in the radius of the brush end */
     /* outside the clipping area               */
     /* XXX HACK - dg */
-    if (t->flag & T_PROP_EDIT_ALL) {
+    if (t->flag & T_PROP_EDIT) {
       clipUVData(t);
     }
   }



More information about the Bf-blender-cvs mailing list