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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-03-26 13:39:11 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-04-01 15:43:45 +0300
commit4370d00b0b423f6467bb5d0d09de7e901d23fffe (patch)
tree963c692243311d1063411f231f31840f60b74350 /source/blender/blenkernel/intern/mesh_convert.c
parent64c8d72ef1ad01dae0ef0a7a78a47d7c83a240d4 (diff)
Modifiers: Proper fix for the Apply Modifier
It is up to the operator to pass valid object to the modifiers evaluation. Fixes T62916: Applying boolean modifier does not set materials properly
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_convert.c')
-rw-r--r--source/blender/blenkernel/intern/mesh_convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index eab4862b14a..f02f1c20aba 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1120,7 +1120,7 @@ Mesh *BKE_mesh_create_derived_for_modifier(
struct Depsgraph *depsgraph, Scene *scene, Object *ob,
ModifierData *md, int build_shapekey_layers)
{
- Mesh *me = ob->data;
+ Mesh *me = ob->runtime.mesh_orig ? ob->runtime.mesh_orig : ob->data;
const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
Mesh *result;
KeyBlock *kb;