Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 07:05:40 +0000 (17:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2018 07:05:40 +0000 (17:05 +1000)
build_files/build_environment/CMakeLists.txt
build_files/build_environment/cmake/blosc.cmake
build_files/build_environment/cmake/ffmpeg.cmake
build_files/build_environment/cmake/opencolorio.cmake
build_files/build_environment/cmake/openvdb.cmake
build_files/build_environment/cmake/sdl.cmake
build_files/build_environment/cmake/versions.cmake
intern/cycles/kernel/kernel_accumulate.h

index 15ac68ef0b026be7a7b949d9d46b79f9020d1127..81810e3e457a09bccf830135292738aabb8ff6d2 100644 (file)
@@ -102,7 +102,7 @@ if(WIN32)
        #ocio deps
        include(cmake/tinyxml.cmake)
        include(cmake/yamlcpp.cmake)
-       #lcms is an ocio dep, but only if you build the apps, leaving it here for convenience 
+       #lcms is an ocio dep, but only if you build the apps, leaving it here for convenience
        #include(cmake/lcms.cmake)
 endif()
 
index e432096b93f77dbf0dd02b08d924613cc3a17164..b0a0460aa94d9afee9a088857bf393502c497b93 100644 (file)
@@ -72,4 +72,3 @@ if (WIN32)
                )
        endif()
 endif()
-
index 7a3c884e7bce5814e3af1253d0649ef73eb7f601..b1e69b794df135b0e54125e78b89330a4fde105e 100644 (file)
@@ -145,5 +145,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
                DEPENDEES install
        )
 endif()
-
-
index db0350e8d9dca8b146ad850b8df5d6f14e1674ae..c0187e8a27e0285d4b4ee2e99ea9660879ce6a41 100644 (file)
@@ -110,4 +110,3 @@ if(WIN32)
        endif()
 
 endif()
-
index 85c3d84771a5f7e287ce476197ad2fabd7a03a35..a9533a89b1b48ebd856b7bf07d2c6184151feaae 100644 (file)
@@ -97,4 +97,3 @@ if(WIN32)
                )
        endif()
 endif()
-
index 4e32245f81fbd1d4011bc4a2770663cc9718f482..8383c5a5a79f6b54d43395e276ddafeb23b19d24 100644 (file)
@@ -46,4 +46,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
                DEPENDEES install
        )
 endif()
-
index 0d5d8e773e3573e8b9f3dceb71b9caa01dd1d699..594aa990d313ed65efc9b526cf5a819b0700c731 100644 (file)
@@ -274,4 +274,3 @@ set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714)
 set(FLEXBISON_VERSION 2.5.5)
 set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
 set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-
index 6b3cec9fda6ae88c37b8b38d6f6f11b0f2c2d10e..86ad6e1a0615e14b0ee94b2696cd9738a2738de6 100644 (file)
@@ -320,7 +320,13 @@ ccl_device_inline void path_radiance_accum_ao(PathRadiance *L,
                                               float3 bsdf,
                                               float3 ao)
 {
+       /* Store AO pass. */
+       if(L->use_light_pass && state->bounce == 0) {
+               L->ao += alpha*throughput*ao;
+       }
+
 #ifdef __SHADOW_TRICKS__
+       /* For shadow catcher, accumulate ratio. */
        if(state->flag & PATH_RAY_STORE_SHADOW_INFO) {
                float3 light = throughput * bsdf;
                L->path_total += light;
@@ -335,12 +341,11 @@ ccl_device_inline void path_radiance_accum_ao(PathRadiance *L,
 #ifdef __PASSES__
        if(L->use_light_pass) {
                if(state->bounce == 0) {
-                       /* directly visible lighting */
+                       /* Directly visible lighting. */
                        L->direct_diffuse += throughput*bsdf*ao;
-                       L->ao += alpha*throughput*ao;
                }
                else {
-                       /* indirectly visible lighting after BSDF bounce */
+                       /* Indirectly visible lighting after BSDF bounce. */
                        L->indirect += throughput*bsdf*ao;
                }
        }