diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-11-25 20:22:20 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-25 20:24:46 +0300 |
commit | 2fb8c6805a982c3b617abc60459c6f40c7a9230c (patch) | |
tree | 8c11eddf85c970a02c1c7510a6a17718aef7c895 /intern | |
parent | e6a41e1c806b318eaa866fdc2a100c4e7fedfb15 (diff) |
Fix build error with experimental features after recent release cycle bump
Hair, pointcloud and simulation datablock types should be disabled in the
beta cycles already like other experimental features.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/curves.cpp | 10 | ||||
-rw-r--r-- | intern/cycles/blender/geometry.cpp | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/intern/cycles/blender/curves.cpp b/intern/cycles/blender/curves.cpp index ffe0c553738..a704b803cb0 100644 --- a/intern/cycles/blender/curves.cpp +++ b/intern/cycles/blender/curves.cpp @@ -819,11 +819,14 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BObjectInfo &b_ob_info, H new_hair.set_used_shaders(used_shaders); if (view_layer.use_hair) { +#ifdef WITH_HAIR_NODES if (b_ob_info.object_data.is_a(&RNA_Hair)) { /* Hair object. */ sync_hair(&new_hair, b_ob_info, false); } - else { + else +#endif + { /* Particle hair. */ bool need_undeformed = new_hair.need_attribute(scene, ATTR_STD_GENERATED); BL::Mesh b_mesh = object_to_mesh( @@ -870,12 +873,15 @@ void BlenderSync::sync_hair_motion(BL::Depsgraph b_depsgraph, /* Export deformed coordinates. */ if (ccl::BKE_object_is_deform_modified(b_ob_info, b_scene, preview)) { +#ifdef WITH_HAIR_NODES if (b_ob_info.object_data.is_a(&RNA_Hair)) { /* Hair object. */ sync_hair(hair, b_ob_info, true, motion_step); return; } - else { + else +#endif + { /* Particle hair. */ BL::Mesh b_mesh = object_to_mesh( b_data, b_ob_info, b_depsgraph, false, Mesh::SUBDIVISION_NONE); diff --git a/intern/cycles/blender/geometry.cpp b/intern/cycles/blender/geometry.cpp index 479e76f68bc..a5f36a3a17d 100644 --- a/intern/cycles/blender/geometry.cpp +++ b/intern/cycles/blender/geometry.cpp @@ -31,7 +31,11 @@ CCL_NAMESPACE_BEGIN static Geometry::Type determine_geom_type(BObjectInfo &b_ob_info, bool use_particle_hair) { +#ifdef WITH_HAIR_NODES if (b_ob_info.object_data.is_a(&RNA_Hair) || use_particle_hair) { +#else + if (use_particle_hair) { +#endif return Geometry::HAIR; } @@ -215,7 +219,11 @@ void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph, if (progress.get_cancel()) return; +#ifdef WITH_HAIR_NODES if (b_ob_info.object_data.is_a(&RNA_Hair) || use_particle_hair) { +#else + if (use_particle_hair) { +#endif Hair *hair = static_cast<Hair *>(geom); sync_hair_motion(b_depsgraph, b_ob_info, hair, motion_step); } |