Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-06-27 17:12:46 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-06-27 17:13:02 +0300
commit9f5fae1f2c1686cea3e23c1c7757ec7219b9d117 (patch)
treea29ec703cb095f9c96c283a8d41e64701c3c6051 /source/blender/editors/transform/transform_convert.c
parentd7b10e5b740fe23f6c713fb9604dcc8b49a83050 (diff)
Revert "Fix T78259: Proportional editing does not work in particle editing"
This reverts commit 5c48592ccde08e18d13255e89d09067d5dc0f771. Ii introduced a stupid error. Fix T78352
Diffstat (limited to 'source/blender/editors/transform/transform_convert.c')
-rw-r--r--source/blender/editors/transform/transform_convert.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index 71e5bca70b1..ce37cb9dacd 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -1086,6 +1086,7 @@ void createTransData(bContext *C, TransInfo *t)
convert_type = TC_MBALL_VERTS;
}
else if (t->obedit_type == OB_ARMATURE) {
+ t->flag &= ~T_PROP_EDIT;
convert_type = TC_ARMATURE_VERTS;
}
}
@@ -1163,7 +1164,6 @@ void createTransData(bContext *C, TransInfo *t)
break;
case TC_ARMATURE_VERTS:
createTransArmatureVerts(t);
- init_prop_edit = false;
break;
case TC_CURSOR_IMAGE:
createTransCursor_image(t);
@@ -1291,10 +1291,6 @@ void createTransData(bContext *C, TransInfo *t)
* and are still added into transform data. */
sort_trans_data_selected_first(t);
}
-
- if (!init_prop_edit) {
- t->flag &= ~T_PROP_EDIT;
- }
}
BLI_assert((!(t->flag & T_EDIT)) == (!(t->obedit_type != -1)));