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:
authorBastien Montagne <bastien@blender.org>2020-07-29 19:22:33 +0300
committerBastien Montagne <bastien@blender.org>2020-07-29 19:22:33 +0300
commitebda95953c8c2d22a4a427e1b5711cad7ae91136 (patch)
tree5682b9de1266baeea1bf23efa5c702b62bccbcec
parentf62c7c546a3fe7df31d787e33ef1dc37e1ca095b (diff)
parent3274ce0a8ea9ff7adb552d71f01bc76c04a8c5ca (diff)
Merge branch 'blender-v2.90-release'
-rw-r--r--source/blender/modifiers/intern/MOD_hook.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c
index c8cfc07562f..861d5ea7435 100644
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@ -40,6 +40,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_mesh.h"
+#include "BKE_mesh_wrapper.h"
#include "BKE_modifier.h"
#include "BKE_screen.h"
@@ -394,6 +395,11 @@ static void deformVertsEM(struct ModifierData *md,
Mesh *mesh_src = MOD_deform_mesh_eval_get(
ctx->object, editData, mesh, NULL, numVerts, false, false);
+ /* TODO(Campbell): use edit-mode data only (remove this line). */
+ if (mesh_src != NULL) {
+ BKE_mesh_wrapper_ensure_mdata(mesh_src);
+ }
+
deformVerts_do(hmd, ctx, ctx->object, mesh_src, vertexCos, numVerts);
if (!ELEM(mesh_src, NULL, mesh)) {