Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles Embree hair + motion blur failing after recent Catmull-Rom change

Browse Source 
Ref T73778
This commit is contained in:
Brecht Van Lommel
2020-02-24 20:29:01 +01:00
parent d109ea5ee5
commit f61f26b033
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/bvh/bvh_embree.cpp
View File

@@ -728,8 +728,9 @@ void BVHEmbree::update_curve_vertex_buffer(RTCGeometry geom_id, const Hair *hair
} }
/* Catmull-Rom splines need extra CVs at the beginning and end of each curve. */ /* Catmull-Rom splines need extra CVs at the beginning and end of each curve. */
size_t num_keys_embree = num_keys;
if (use_curves) { if (use_curves) {
num_keys += num_curves * 2; num_keys_embree += num_curves * 2;
} }
/* Copy the CV data to Embree */ /* Copy the CV data to Embree */
@@ -746,7 +747,7 @@ void BVHEmbree::update_curve_vertex_buffer(RTCGeometry geom_id, const Hair *hair
} }
float4 *rtc_verts = (float4 *)rtcSetNewGeometryBuffer( float4 *rtc_verts = (float4 *)rtcSetNewGeometryBuffer(
geom_id, RTC_BUFFER_TYPE_VERTEX, t, RTC_FORMAT_FLOAT4, sizeof(float) * 4, num_keys); geom_id, RTC_BUFFER_TYPE_VERTEX, t, RTC_FORMAT_FLOAT4, sizeof(float) * 4, num_keys_embree);
assert(rtc_verts); assert(rtc_verts);
if (rtc_verts) { if (rtc_verts) {
@@ -767,7 +768,7 @@ void BVHEmbree::update_curve_vertex_buffer(RTCGeometry geom_id, const Hair *hair
} }
} }
else { else {
for (size_t j = 0; j < num_keys; ++j) { for (size_t j = 0; j < num_keys_embree; ++j) {
rtc_verts[j] = float3_to_float4(verts[j]); rtc_verts[j] = float3_to_float4(verts[j]);
rtc_verts[j].w = curve_radius[j]; rtc_verts[j].w = curve_radius[j];
} }