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:
authorAlan Troth <Al>2020-06-16 09:44:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-06-16 09:45:53 +0300
commita64b8aca394fbff622309613d7efef2cae28c0d4 (patch)
tree4425b0259045f83fc1b2142e7165f11977765292 /source/blender/editors/transform/transform_convert_mesh.c
parentf72419b9ae0335a84d50840c316e0e2fb915f907 (diff)
Fix T61777: Proportional editing doesn't work with multi edit-mode
Diffstat (limited to 'source/blender/editors/transform/transform_convert_mesh.c')
-rw-r--r--source/blender/editors/transform/transform_convert_mesh.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index e273c23e675..27ddad262f7 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -707,9 +707,10 @@ void createTransEditVerts(TransInfo *t)
*
* \note ignore modes here, even in edge/face modes,
* transform data is created by selected vertices.
- * \note in prop mode we need at least 1 selected.
*/
- if (bm->totvertsel == 0) {
+
+ /* Support other objects using PET to adjust these, unless connected is enabled. */
+ if ((!prop_mode || (prop_mode & T_PROP_CONNECTED)) && (bm->totvertsel == 0)) {
goto cleanup;
}
@@ -734,6 +735,10 @@ void createTransEditVerts(TransInfo *t)
}
}
+ if (data_len == 0) {
+ goto cleanup;
+ }
+
/* allocating scratch arrays */
if (prop_mode & T_PROP_CONNECTED) {
dists = MEM_mallocN(em->bm->totvert * sizeof(float), __func__);