diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 08:43:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 08:43:51 +0300 |
| commit | d32e4ca70161eb83179e4ebd1dc538afc1b311c1 (patch) | |
| tree | 1f7e12fb8558f2a7b3c083bc304389acda19a208 | |
| parent | a5b7f1ef535038be549530612c7eed9109e1d4b4 (diff) | |
| parent | f3b9fa53935e1f199063b020dded04135267b0a8 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | build_files/cmake/macros.cmake | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_ambient_occlusion.osl | 4 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 2 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index d6fde945173..ce2241a775d 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1137,7 +1137,7 @@ macro(remove_strict_c_flags_file filenames) foreach(_SOURCE ${ARGV}) if(CMAKE_COMPILER_IS_GNUCC OR - (CMAKE_C_COMPILER_ID MATCHES "Clang")) + (CMAKE_C_COMPILER_ID MATCHES "Clang")) set_source_files_properties(${_SOURCE} PROPERTIES COMPILE_FLAGS "${C_REMOVE_STRICT_FLAGS}" @@ -1155,10 +1155,10 @@ macro(remove_strict_cxx_flags_file remove_strict_c_flags_file(${filenames} ${ARHV}) foreach(_SOURCE ${ARGV}) if(CMAKE_COMPILER_IS_GNUCC OR - (CMAKE_C_COMPILER_ID MATCHES "Clang")) + (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) set_source_files_properties(${_SOURCE} PROPERTIES - COMPILE_FLAGS "${C_REMOVE_STRICT_FLAGS}" + COMPILE_FLAGS "${CXX_REMOVE_STRICT_FLAGS}" ) endif() if(MSVC) diff --git a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl index d7ffa3c1606..865ad4c9fb9 100644 --- a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl +++ b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl @@ -17,13 +17,13 @@ #include "stdosl.h" shader node_ambient_occlusion( - color ColorIn = color(0.8, 0.8, 0.8), + color ColorIn = color(1.0, 1.0, 1.0), int samples = 8, float Distance = 1.0, normal Normal = N, int inside = 0, int only_local = 1, - output color ColorOut = color(0.8, 0.8, 0.8), + output color ColorOut = color(1.0, 1.0, 1.0), output float AO = 1.0) { int global_radius = (Distance == 0.0 && !isconnected(Distance)); diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 59ac6257499..ea25056e9fd 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2794,7 +2794,7 @@ NODE_DEFINE(AmbientOcclusionNode) SOCKET_INT(samples, "Samples", 8); - SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f)); + SOCKET_IN_COLOR(color, "Color", make_float3(1.0f, 1.0f, 1.0f)); SOCKET_IN_FLOAT(distance, "Distance", 1.0f); SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL); diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c index eae35b4cd22..0ccfb64a37d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c +++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c @@ -30,14 +30,14 @@ /* **************** OUTPUT ******************** */ static bNodeSocketTemplate sh_node_ambient_occlusion_in[] = { - { SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, + { SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f}, { SOCK_FLOAT, 0, N_("Distance"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000.0f}, { SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE}, { -1, 0, "" } }; static bNodeSocketTemplate sh_node_ambient_occlusion_out[] = { - { SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, + { SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f}, { SOCK_FLOAT, 0, N_("AO"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, { -1, 0, "" } }; |