[Bf-blender-cvs] [01cb35cc8f7] master: Fix Cycles error with hair and spatial splits after recent changes

Brecht Van Lommel noreply at git.blender.org
Sat Feb 8 23:26:39 CET 2020


Commit: 01cb35cc8f787a13b2e240a38e3fd478eb76825c
Author: Brecht Van Lommel
Date:   Sat Feb 8 23:26:09 2020 +0100
Branches: master
https://developer.blender.org/rB01cb35cc8f787a13b2e240a38e3fd478eb76825c

Fix Cycles error with hair and spatial splits after recent changes

===================================================================

M	intern/cycles/bvh/bvh_split.cpp

===================================================================

diff --git a/intern/cycles/bvh/bvh_split.cpp b/intern/cycles/bvh/bvh_split.cpp
index 7e787674b74..acdca0f13ad 100644
--- a/intern/cycles/bvh/bvh_split.cpp
+++ b/intern/cycles/bvh/bvh_split.cpp
@@ -464,7 +464,7 @@ void BVHSpatialSplit::split_object_reference(
       split_triangle_primitive(mesh, &object->tfm, tri_idx, dim, pos, left_bounds, right_bounds);
     }
   }
-  else if (geom->type == Geometry::MESH) {
+  else if (geom->type == Geometry::HAIR) {
     Hair *hair = static_cast<Hair *>(geom);
     for (int curve_idx = 0; curve_idx < hair->num_curves(); ++curve_idx) {
       Hair::Curve curve = hair->get_curve(curve_idx);



More information about the Bf-blender-cvs mailing list