From 91d320edc3cfb30443af4adbcb09bc3d7a609e1d Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Sat, 31 Oct 2020 19:21:07 +0300 Subject: Cycles: immediately store the used_shader list in Blender interface. Uniform attributes require immediate access to the shader list in object update code, so setting the field can't be deferred to a background task. This required adding a parameter to the clear method of Geometry. Ref D2057 --- intern/cycles/render/hair.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render/hair.cpp') diff --git a/intern/cycles/render/hair.cpp b/intern/cycles/render/hair.cpp index 816c15cf4ef..3853604f78a 100644 --- a/intern/cycles/render/hair.cpp +++ b/intern/cycles/render/hair.cpp @@ -321,9 +321,9 @@ void Hair::reserve_curves(int numcurves, int numkeys) attributes.resize(true); } -void Hair::clear() +void Hair::clear(bool preserve_shaders) { - Geometry::clear(); + Geometry::clear(preserve_shaders); curve_keys.clear(); curve_radius.clear(); -- cgit v1.2.3