diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-25 13:52:32 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-25 13:53:25 +0300 |
commit | 7463da6c72a0fb2bc72bda53ece27670d5af2c72 (patch) | |
tree | c34870a0748e63cdd400686b8ffb194412765a6b /intern/cycles/blender/blender_sync.h | |
parent | e0085bfd24da3dcfb30498ad8c579620042aa6c5 (diff) |
Fix T74095: crash deleting all faces in edit mode with Cycles rendering
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index efd4511eb1e..219a3615835 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -137,14 +137,20 @@ class BlenderSync { bool *use_portal); /* Volume */ - void sync_volume(BL::Object &b_ob, Mesh *mesh); + void sync_volume(BL::Object &b_ob, Mesh *mesh, const vector<Shader *> &used_shaders); /* Mesh */ - void sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *mesh); + void sync_mesh(BL::Depsgraph b_depsgraph, + BL::Object b_ob, + Mesh *mesh, + const vector<Shader *> &used_shaders); void sync_mesh_motion(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *mesh, int motion_step); /* Hair */ - void sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, Geometry *geom); + void sync_hair(BL::Depsgraph b_depsgraph, + BL::Object b_ob, + Geometry *geom, + const vector<Shader *> &used_shaders); void sync_hair_motion(BL::Depsgraph b_depsgraph, BL::Object b_ob, Geometry *geom, |