diff options
author | Martijn Berger <mberger@denc.com> | 2014-09-24 15:34:28 +0400 |
---|---|---|
committer | Martijn Berger <mberger@denc.com> | 2014-09-24 15:34:28 +0400 |
commit | 25ec0d97f988154583295335c22a9ccd7894fe65 (patch) | |
tree | cab4dd66d4467e46a753d5d179c4a5990e0b96ca /intern/cycles/render/scene.h | |
parent | cbffc7499ef89cac19c07ee2116b8e1e5d38afe5 (diff) |
make "tri_shader" an int instead of a float
tri_shader does no longer need to a float.
Reviewers: dingto, sergey
Reviewed By: dingto, sergey
Subscribers: dingto
Projects: #cycles
Differential Revision: https://developer.blender.org/D789
Diffstat (limited to 'intern/cycles/render/scene.h')
-rw-r--r-- | intern/cycles/render/scene.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index e5c7444c92d..5d205225d97 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -69,7 +69,7 @@ public: device_vector<uint> prim_object; /* mesh */ - device_vector<float> tri_shader; + device_vector<uint> tri_shader; device_vector<float4> tri_vnormal; device_vector<float4> tri_vindex; device_vector<float4> tri_verts; |