diff options
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/png.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/tiff.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 16 | ||||
| -rw-r--r-- | intern/cycles/graph/node_enum.h | 3 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 6 |
6 files changed, 13 insertions, 18 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 8c1d38c0635..f76c8175e50 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -114,7 +114,7 @@ endif() if(NOT WIN32 OR ENABLE_MINGW64) include(cmake/openjpeg.cmake) - if(BUILD_MODE STREQUAL Release) + if(NOT WIN32 OR BUILD_MODE STREQUAL Release) if(WIN32) include(cmake/zlib_mingw.cmake) endif() diff --git a/build_files/build_environment/cmake/png.cmake b/build_files/build_environment/cmake/png.cmake index 803438cbd2a..6e51fb9ebe4 100644 --- a/build_files/build_environment/cmake/png.cmake +++ b/build_files/build_environment/cmake/png.cmake @@ -36,7 +36,7 @@ add_dependencies( external_zlib ) -if(BUILD_MODE STREQUAL Debug) +if(WIN32 AND BUILD_MODE STREQUAL Debug) ExternalProject_Add_Step(external_png after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT} DEPENDEES install diff --git a/build_files/build_environment/cmake/tiff.cmake b/build_files/build_environment/cmake/tiff.cmake index 0f22daf05b1..498145463cf 100644 --- a/build_files/build_environment/cmake/tiff.cmake +++ b/build_files/build_environment/cmake/tiff.cmake @@ -39,7 +39,7 @@ add_dependencies( external_zlib ) -if(BUILD_MODE STREQUAL Debug) +if(WIN32 AND BUILD_MODE STREQUAL Debug) ExternalProject_Add_Step(external_tiff after_install COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT} DEPENDEES install diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake index 396bb3a318e..3c07fb3c08a 100644 --- a/build_files/build_environment/cmake/zlib.cmake +++ b/build_files/build_environment/cmake/zlib.cmake @@ -40,16 +40,8 @@ if (WIN32) ) endif() else() - if(BUILD_MODE STREQUAL Debug) - ExternalProject_Add_Step(external_zlib after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} - DEPENDEES install - ) - endif() - if (UNIX) - ExternalProject_Add_Step(external_zlib after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a - DEPENDEES install - ) - endif() + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a + DEPENDEES install + ) endif() diff --git a/intern/cycles/graph/node_enum.h b/intern/cycles/graph/node_enum.h index 9de776ddb55..705aec9a918 100644 --- a/intern/cycles/graph/node_enum.h +++ b/intern/cycles/graph/node_enum.h @@ -39,6 +39,9 @@ struct NodeEnum { int operator[](ustring x) const { return left.find(x)->second; } ustring operator[](int y) const { return right.find(y)->second; } + unordered_map<ustring, int, ustringHash>::const_iterator begin() const { return left.begin(); } + unordered_map<ustring, int, ustringHash>::const_iterator end() const { return left.end(); } + private: unordered_map<ustring, int, ustringHash> left; unordered_map<int, ustring> right; diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 4af0d8663e8..727cbe243ac 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -3732,7 +3732,7 @@ void LightPathNode::compile(OSLCompiler& compiler) NODE_DEFINE(LightFalloffNode) { - NodeType* type = NodeType::add("light_fallof", create, NodeType::SHADER); + NodeType* type = NodeType::add("light_falloff", create, NodeType::SHADER); SOCKET_IN_FLOAT(strength, "Strength", 100.0f); SOCKET_IN_FLOAT(smooth, "Smooth", 0.0f); @@ -5840,7 +5840,7 @@ NODE_DEFINE(NormalMapNode) space_enum.insert("world", NODE_NORMAL_MAP_WORLD); space_enum.insert("blender_object", NODE_NORMAL_MAP_BLENDER_OBJECT); space_enum.insert("blender_world", NODE_NORMAL_MAP_BLENDER_WORLD); - SOCKET_ENUM(space, "Space", space_enum, NODE_TANGENT_RADIAL); + SOCKET_ENUM(space, "Space", space_enum, NODE_NORMAL_MAP_TANGENT); SOCKET_STRING(attribute, "Attribute", ustring()); @@ -6051,7 +6051,7 @@ NODE_DEFINE(DisplacementNode) space_enum.insert("object", NODE_NORMAL_MAP_OBJECT); space_enum.insert("world", NODE_NORMAL_MAP_WORLD); - SOCKET_ENUM(space, "Space", space_enum, NODE_NORMAL_MAP_TANGENT); + SOCKET_ENUM(space, "Space", space_enum, NODE_NORMAL_MAP_OBJECT); SOCKET_IN_FLOAT(height, "Height", 0.0f); SOCKET_IN_FLOAT(midlevel, "Midlevel", 0.5f); |