Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Werner <stefan.werner@tangent-animation.com>2018-03-08 02:35:24 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-03-10 06:54:04 +0300
commitf3010e98c343a83e07ff6c2a5437d0043122b083 (patch)
tree5b65da3162727bf00c88babcb216d8dbb4c5a269 /intern/cycles/render/scene.h
parentfa9175ff02acffd02679398e17732f3832d3fc28 (diff)
Code refactor: use KernelShader and KernelParticle instead of float arrays.
Original patch by Stefan with modifications by Brecht.
Diffstat (limited to 'intern/cycles/render/scene.h')
-rw-r--r--intern/cycles/render/scene.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 3f089b9138f..316ffeb1092 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -102,11 +102,11 @@ public:
device_vector<float2> light_background_conditional_cdf;
/* particles */
- device_vector<float4> particles;
+ device_vector<KernelParticle> particles;
/* shaders */
device_vector<int4> svm_nodes;
- device_vector<uint> shader_flag;
+ device_vector<KernelShader> shaders;
device_vector<uint> object_flag;
/* lookup tables */