diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-10-26 15:07:00 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-10-26 15:07:00 +0300 |
commit | 4d5e0a852060fbac1a56eb04511c08b5409c8d3d (patch) | |
tree | 779f7c63c7bd7f2c5733d0df8ef20d67d2b19bc8 /intern/cycles/blender | |
parent | 57fc44de6ca085178b3834db2b8a842e96f31eac (diff) | |
parent | f76f48c3d3eb3ac518fed158a0f17c7507604ca8 (diff) |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/blender_geometry.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_id_map.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/blender_geometry.cpp index 14da8075903..c7637fe8608 100644 --- a/intern/cycles/blender/blender_geometry.cpp +++ b/intern/cycles/blender/blender_geometry.cpp @@ -52,11 +52,11 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph, /* Test if we can instance or if the object is modified. */ BL::ID b_ob_data = b_ob.data(); BL::ID b_key_id = (BKE_object_is_modified(b_ob)) ? b_ob_instance : b_ob_data; - GeometryKey key(b_key_id.ptr.data, use_particle_hair); BL::Material material_override = view_layer.material_override; Shader *default_shader = (b_ob.type() == BL::Object::type_VOLUME) ? scene->default_volume : scene->default_surface; Geometry::Type geom_type = determine_geom_type(b_ob, use_particle_hair); + GeometryKey key(b_key_id.ptr.data, geom_type); /* Find shader indices. */ vector<Shader *> used_shaders; diff --git a/intern/cycles/blender/blender_id_map.h b/intern/cycles/blender/blender_id_map.h index f9f201c2e4e..8ce1d23665d 100644 --- a/intern/cycles/blender/blender_id_map.h +++ b/intern/cycles/blender/blender_id_map.h @@ -19,6 +19,7 @@ #include <string.h> +#include "render/geometry.h" #include "render/scene.h" #include "util/util_map.h" @@ -230,9 +231,9 @@ struct ObjectKey { struct GeometryKey { void *id; - bool use_particle_hair; + Geometry::Type geometry_type; - GeometryKey(void *id, bool use_particle_hair) : id(id), use_particle_hair(use_particle_hair) + GeometryKey(void *id, Geometry::Type geometry_type) : id(id), geometry_type(geometry_type) { } @@ -242,7 +243,7 @@ struct GeometryKey { return true; } else if (id == k.id) { - if (use_particle_hair < k.use_particle_hair) { + if (geometry_type < k.geometry_type) { return true; } } |