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:
authorMartijn Berger <mberger@denc.com>2014-09-24 15:34:28 +0400
committerMartijn Berger <mberger@denc.com>2014-09-24 15:34:28 +0400
commit25ec0d97f988154583295335c22a9ccd7894fe65 (patch)
treecab4dd66d4467e46a753d5d179c4a5990e0b96ca /intern/cycles/render/mesh.h
parentcbffc7499ef89cac19c07ee2116b8e1e5d38afe5 (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/mesh.h')
-rw-r--r--intern/cycles/render/mesh.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index d45905611fa..28cee5745ea 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -123,7 +123,7 @@ public:
void add_face_normals();
void add_vertex_normals();
- void pack_normals(Scene *scene, float *shader, float4 *vnormal);
+ void pack_normals(Scene *scene, uint *shader, float4 *vnormal);
void pack_verts(float4 *tri_verts, float4 *tri_vindex, size_t vert_offset);
void pack_curves(Scene *scene, float4 *curve_key_co, float4 *curve_data, size_t curvekey_offset);
void compute_bvh(SceneParams *params, Progress *progress, int n, int total);