diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-01 18:26:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-01 18:26:36 +0300 |
| commit | e44743736f39246192b49912073a96b4a5cdd2ee (patch) | |
| tree | d01a6c42376d9dbfc3f58965289e10be20def4ee /intern | |
| parent | e4a727626e34eef20e2b41cc3e26b41db4f360a0 (diff) | |
| parent | 051e186d5c61dccfc776b8da9b83c598421be4e7 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 03d24c04e2a..6fe650f3699 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -1173,7 +1173,7 @@ Mesh *BlenderSync::sync_mesh(BL::Depsgraph& b_depsgraph, * freed data from the blender side. */ if(preview && b_ob.type() != BL::Object::type_MESH) - b_ob.update_from_editmode(); + b_ob.update_from_editmode(b_data); bool need_undeformed = mesh->need_attribute(scene, ATTR_STD_GENERATED); |