Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2018 05:43:51 +0000 (07:43 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2018 05:43:51 +0000 (07:43 +0200)
build_files/cmake/macros.cmake
intern/cycles/kernel/shaders/node_ambient_occlusion.osl
intern/cycles/render/nodes.cpp
source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c

index d6fde945173b6ef28ef3973a4d745a91ccc12647..ce2241a775dd8149c3ab9f8fc10230a95ef1a67c 100644 (file)
@@ -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)
index d7ffa3c1606fc484184c199fdd368824503db327..865ad4c9fb9b828660b67118d5432840fb2cafa3 100644 (file)
 #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));
index 59ac625749904875c22b90f5ea85191eadf1ffb2..ea25056e9fdf139112f6b513b0b441541175a6d7 100644 (file)
@@ -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);
 
index eae35b4cd22dad6d9f7039d052e25e255be1d23c..0ccfb64a37d9c731823b45360d452c1d4a180cc0 100644 (file)
 /* **************** 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, ""       }
 };