diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 18:12:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 18:35:15 +0300 |
| commit | 24d53f79b217ff7c62e4c32a49967447a0230fef (patch) | |
| tree | bdc956af250dd44e72520f14f1db0c82c258432d /intern/cycles/render/object.cpp | |
| parent | 055001111e226e953b18c31deaacc2e1e7394f78 (diff) | |
Fix Cycles debug build assert on some platforms, tighten checks to avoid this in the future.
Diffstat (limited to 'intern/cycles/render/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 644e581bf4b..ff1f678c2d2 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -39,8 +39,8 @@ NODE_DEFINE(Object) SOCKET_NODE(mesh, "Mesh", &Mesh::node_type); SOCKET_TRANSFORM(tfm, "Transform", transform_identity()); - SOCKET_INT(visibility, "Visibility", ~0); - SOCKET_INT(random_id, "Random ID", 0); + SOCKET_UINT(visibility, "Visibility", ~0); + SOCKET_UINT(random_id, "Random ID", 0); SOCKET_INT(pass_id, "Pass ID", 0); SOCKET_BOOLEAN(use_holdout, "Use Holdout", false); SOCKET_POINT(dupli_generated, "Dupli Generated", make_float3(0.0f, 0.0f, 0.0f)); |