diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-30 23:44:17 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
commit | a72de9116e0a4f760ed5c59b7f500d641c5369d4 (patch) | |
tree | f3110d54f9b51a8e9d015c2c91ae08973dc8eb2a /intern/cycles/render | |
parent | 00aa6a8c91920fdf9c88d13c52832c071e469b74 (diff) |
Fix broken Cycles curve motion radius after recent refactor, and fix warnings.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/mesh.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/render/mesh.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 00b8e02f87f..d92226d6910 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -240,7 +240,7 @@ void Mesh::add_curve_key(float3 co, float radius) curve_radius.push_back_reserved(radius); } -void Mesh::add_curve(int first_key, int num_keys, int shader) +void Mesh::add_curve(int first_key, int shader) { curve_first_key.push_back_reserved(first_key); curve_shader.push_back_reserved(shader); diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 7556b7ccf1e..5c788fc12c7 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -158,7 +158,7 @@ public: void add_vertex(float3 P); void add_triangle(int v0, int v1, int v2, int shader, bool smooth, bool forms_quad = false); void add_curve_key(float3 loc, float radius); - void add_curve(int first_key, int num_keys, int shader); + void add_curve(int first_key, int shader); int split_vertex(int vertex); void compute_bounds(); |