archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix Cycles debug build assert on some platforms, tighten checks to avoid this in the future.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-06-12 17:12:25 +02:00
parent 055001111e
commit 24d53f79b2
13 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/object.cpp
View File

@@ -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));