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/background.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/background.cpp')
-rw-r--r-- | intern/cycles/render/background.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp index 20536b74e87..8d7d7b847fd 100644 --- a/intern/cycles/render/background.cpp +++ b/intern/cycles/render/background.cpp @@ -32,12 +32,12 @@ NODE_DEFINE(Background) { NodeType* type = NodeType::add("background", create); - SOCKET_INT(ao_factor, "AO Factor", 0.0f); + SOCKET_FLOAT(ao_factor, "AO Factor", 0.0f); SOCKET_FLOAT(ao_distance, "AO Distance", FLT_MAX); SOCKET_BOOLEAN(use_shader, "Use Shader", true); SOCKET_BOOLEAN(use_ao, "Use AO", false); - SOCKET_INT(visibility, "Visibility", PATH_RAY_ALL_VISIBILITY); + SOCKET_UINT(visibility, "Visibility", PATH_RAY_ALL_VISIBILITY); SOCKET_BOOLEAN(transparent, "Transparent", false); SOCKET_NODE(shader, "Shader", &Shader::node_type); |