kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton 2018-08-21 17:05:40 +10:00
commit 797274d256
8 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/CMakeLists.txt
View 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()

1
build_files/build_environment/cmake/blosc.cmake
View File

@ -72,4 +72,3 @@ if (WIN32)
)
endif()
endif()

2
build_files/build_environment/cmake/ffmpeg.cmake
View File

@ -145,5 +145,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
DEPENDEES install
)
endif()

1
build_files/build_environment/cmake/opencolorio.cmake
View File

@ -110,4 +110,3 @@ if(WIN32)
endif()
endif()

1
build_files/build_environment/cmake/openvdb.cmake
View File

@ -97,4 +97,3 @@ if(WIN32)
)
endif()
endif()

1
build_files/build_environment/cmake/sdl.cmake
View File

@ -46,4 +46,3 @@ if(BUILD_MODE STREQUAL Release AND WIN32)
DEPENDEES install
)
endif()

1
build_files/build_environment/cmake/versions.cmake
View 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)

11
intern/cycles/kernel/kernel_accumulate.h
View 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;
}
}