diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-17 18:24:44 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-17 20:20:08 +0300 |
| commit | 3009429c9045f70a199d6568a79b2dcbad78d095 (patch) | |
| tree | 54adf1982b36ee7d7fdb4c6b3f786d76972c5bbc /source/blender/blenkernel/intern/mesh.c | |
| parent | 884a3852873f392c1678a1142005da69d0e4cb32 (diff) | |
Fix T69809, T69810: sculpt gone or crashing after render
Make a distinction between flush sculpt changes for rendering, and forcing
sculpt data structures to be rebuilt after mesh changes. Also don't use PBVH
for renders.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index ae9c3400ace..c108ff90850 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1080,12 +1080,12 @@ void BKE_mesh_assign_object(Main *bmain, Object *ob, Mesh *me) { Mesh *old = NULL; - multires_force_update(ob); - if (ob == NULL) { return; } + multires_force_sculpt_rebuild(ob); + if (ob->type == OB_MESH) { old = ob->data; if (old) { |