Blender Git Commit Log
Git Commits -> Revision 316edc1
Revision 316edc1 by Pascal Schön August 16, 2016, 13:24 (GMT) |
Squashed commit of the following: commit 9eed34c7d980e1b998df457c4f76021162c80f78 Merge: ef29aae ae475e3 Author: Pascal Schoen <[email protected]> Date: Tue Aug 16 15:22:32 2016 +0200 Merge branch 'master' into cycles_disney_brdf commit ef29aaee1af8074e0228c480d962700e97ea5b36 Author: Pascal Schoen <[email protected]> Date: Tue Aug 16 15:17:12 2016 +0200 Implemented the fresnel in the multi-scatter GGX for the Disney BSDF - The specular/metallic part uses the multi-scatter GGX - The fresnel of the metallic part is controlled by the specular value - The color of the reflection part when using transparency can be controlled by the specularTint value commit 88567af085ac94119b98c95246b6d6f63161bc01 Merge: cc267e5 285e082 Author: Pascal Schoen <[email protected]> Date: Wed Aug 3 15:05:09 2016 +0200 Merge branch 'master' into cycles_disney_brdf commit cc267e52f20d036a66aeeff127ee1c856f7c651b Author: Pascal Schoen <[email protected]> Date: Wed Aug 3 15:00:25 2016 +0200 Implemented the Disney clearcoat as a variation of the microfacet bsdf, removed the transparency roughness again and added an input for anisotropic rotations commit 81f6c06b1f53180bf32a5c11ac1fa64e2b6abf52 Merge: ece5a08 7065022 Author: Pascal Schoen <[email protected]> Date: Wed Aug 3 11:42:02 2016 +0200 Merge branch 'master' into cycles_disney_brdf commit ece5a08e0d6e51a83c223ea87346134216e5b34e Author: Pascal Schoen <[email protected]> Date: Tue Jul 26 16:29:21 2016 +0200 Base color now applied again to the refraction of transparent Disney materials commit e3aff6849e06853c56da7bd610210dcab70e6070 Author: Pascal Schoen <[email protected]> Date: Tue Jul 26 16:05:19 2016 +0200 Added subsurface color parameter to the Disney shader commit b3ca6d8a2f4f866b323fc2df0a3beff577218c27 Author: Pascal Schoen <[email protected]> Date: Tue Jul 26 12:30:25 2016 +0200 Improvement of the SSS in the Disney shader * Now the bump normal is correctly used for the SSS. * SSS in Disney uses the Disney diffuse shader commit d68729300ee557e90a8e7e4be6eb8ef98db80fe2 Author: Pascal Schoen <[email protected]> Date: Tue Jul 26 12:23:13 2016 +0200 Better calculation of the Disney diffuse part Now the values for NdotL und NdotV are clamped to 0.0f for a better look when using normal maps commit cb6e500b12e7bce884d3db19ee138c975c215f2d Author: Pascal Schoen <[email protected]> Date: Mon Jul 25 16:26:42 2016 +0200 Now one can disable specular reflactions again by setting specular and metallic to 0 (cracked this in the previous commit) commit bfb9cb11b548103369de2a46ce18b4ddf661362c Author: Pascal Schoen <[email protected]> Date: Mon Jul 25 16:11:07 2016 +0200 fixed the Disney SSS and cleaned the initialization of the Disney shaders commit 642c0fdad12548c1a2ccbf595bae3a995d3022f7 Author: Pascal Schoen <[email protected]> Date: Mon Jul 25 16:09:55 2016 +0200 fixed an error that was caused by the missing LABEL_REFLECT in the Disney diffuse shader commit c10b484dcad3412c34455736e9656cd38716bcb0 Author: Jens Verwiebe <[email protected]> Date: Fri Jul 22 01:15:21 2016 +0200 Rollback attempt to fix sss crashing, it prevented crash by disabling sss completely, thus useless commit 462bba3f97fcc41834e0e20cc806a7958e5106f5 Author: Jens Verwiebe <[email protected]> Date: Thu Jul 21 23:11:59 2016 +0200 Add an undef for sc_next for safety commit 32d348577d69be251aa04110c5f6156cd2645f48 Author: Jens Verwiebe <[email protected]> Date: Thu Jul 21 00:15:48 2016 +0200 Attempt to fix Disney SSS commit dbad91ca6d46f5a4a6f2ba7ed4c811ffa723942f Author: Pascal Schoen <[email protected]> Date: Wed Jul 20 11:13:00 2016 +0200 Added a roughness parameter for refractions (for scattering of the rays within an object) With this, one can create a translucent material with a smooth surface and with a milky look. The final refraction roughness has to be calculated using the surface roughness and the refraction roughness because those two are correlated for refractions. If a ray hits a rough surface of a translucent material, it is scattered while entering the surface. Then it is scattered further within the object. The calculation I'm using is the following: RefrRoughnessFinal = 1.0 - (1.0 - Roughness) * (1.0 - RefrRoughness) commit 50ea5e3e34394a727e3cceb6203adb48834a9ab7 Author: Pascal Schoen <[email protected]> Date: Tue Jun 7 10:24:50 2016 +0200 Disney BSDF is now supporting CUDA commit 10974cc826a4bfa8fb3ef59177abf0b0dc441065 Author: Pascal Schoen <[email protected]> Date: Tue May 31 11:18:07 2016 +0200 Added parameters IOR and Transparency for refractions With this, the Disney BRDF/BSSRDF is extended by the BTDF part. commit 218202c0905a4ec93ee19850360d1a39966d2c25 Author: Pascal Schoen <[email protected]> Date: Mon May 30 15:08:18 2016 +0200 Added an additional normal for the clearcoat With this normal one can simulate a thin layer of clearcoat by applying a smoother normal map than the original to this input commit dd139ead7e04aa87a894ccf3732cfce711258ff1 Author: Pascal Schoen <[email protected]> Date: Mon May 30 12:40:56 2016 +0200 Switched to the improved subsurface scattering from Christensen and Burley commit 11160fa4e1c32230119d4506e7e9fd3da2ab37f2 Author: Pascal Schoen <[email protected]> Date: Mon May 30 10:16:30 2016 +0200 Added Disney Sheen shader as a preparation to get to a BSSRDF commit cee4fe0cc94515ee60d4afa4d4e10c41003f1579 Merge: 4f955d0 6b5bab6 Author: Pascal Schoen <[email protected]> Date: Mon May 30 09:08:09 2016 +0200 Merge branch 'cycles_disney_brdf' of git.blender.org:blender into cycles_disney_brdf Conflicts: intern/cycles/kernel/closure/bsdf_disney_clearcoat.h intern/cycles/kernel/closure/bsdf_disney_diffuse.h intern/cycles/kernel/closure/bsdf_disney_specular.h intern/cycles/kernel/closure/bsdf_util.h intern/cycles/kernel/osl/CMakeLists.txt intern/cycles/kernel/osl/bsdf_disney_clearcoat.cpp intern/cycles/kernel/osl/bsdf_disney_diffuse.cpp intern/cycles/kernel/osl/bsdf_disney_specular.cpp intern/cycles/kernel/osl/osl_closures.h intern/cycles/kernel/shaders/node_disney_bsdf.osl intern/cycles/render/nodes.cpp intern/cycles/render/nodes.h commit 4f955d052358206209454decf2c3539e6a21b42f Author: Pascal Schoen <[email protected]> Date: Tue May 24 16:38:23 2016 +0200 SVM and OSL are both working for the simple version of the Disney BRDF commit 1f5c41874b01ad297eb8a6bad9985296c6c0a6e1 Author: Pascal Schoen <[email protected]> Date: Tue May 24 09:58:50 2016 +0200 Disney node can be used without SVM and started to cleanup the OSL implementation There is still some wrong behavior for SVM for the Schlick Fresnel part at the specular and clearcoat commit d4b814e9304ebb44cc7c291cd83f7b7cdebcd152 Author: Pascal Schoen <[email protected]> Date: Wed May 18 10:22:29 2016 +0200 Switched from a parameter struct for Disney parameters to ShaderClosure params commit b86a1f5ba5019c7818153cb70b49f5f7a0bc52a0 Author: Pascal Schoen <[email protected]> Date: Wed May 18 10:19:57 2016 +0200 Added additional variables for storing parameters in the ShaderClosure struct commit 585b88623695fa07dfca9c9909d6d9184c3519c8 Author: Pascal Schoen <[email protected]> Date: Tue May 17 12:03:17 2016 +0200 added output parameter to the DisneyBsdfNode That has been forgotten after removing the inheritance of BsdfNode commit f91a28639884cbda7804715b910d64abba0718ef Author: Pascal Schoen <[email protected]> Date: Tue May 17 10:40:48 2016 +0200 removed BsdfNode class inheritance for DisneyBsdfNode That's due to a naming difference. The Disney BSDF uses the name 'Base Color' while the BsdfNode had a 'Color' input. That caused a text message to be printed while rendering. commit 30da91c9c51d8cbc6a7564c7aaa61c9efe2ab654 Author: Pascal Schoen <[email protected]> Date: Wed May 4 16:08:10 2016 +0200 disney implementation cleaned commit 30d41da0f0352fad29375a395ffcb9cb7891eeb1 Author: Pascal Schoen <[email protected]> Date: Wed May 4 13:23:07 2016 +0200 added the disney brdf as a shader node commit 1f099fce249cb35e949cc629f7cca2167fca881a Author: Pascal Schoen <[email protected]> Date: Tue May 3 16:54:49 2016 +0200 added clearcoat implementation commit 00a1378b98e435e9cdbfbac86eb974c19b2a8151 Author: Pascal Schoen <[email protected]> Date: Fri Apr 29 22:56:49 2016 +0200 disney diffuse und specular implemented commit 6baa7a7eb787638661cddad0c4e7f78bd3a8fa5c Author: Pascal Schoen <[email protected]> Date: Mon Apr 18 15:21:32 2016 +0200 disney diffuse is working correctly commit d8fa169bf3caf71c40a124101b33dee6c510188e Author: Pascal Schoen <[email protected]> Date: Mon Apr 18 08:41:53 2016 +0200 added vessel for disney diffuse shader commit 6b5bab6cecde153122625cf8dc10e4209ed1eb0f Author: Pascal Schoen <[email protected]> Date: Wed May 18 10:22:29 2016 +0200 Switched from a parameter struct for Disney parameters to ShaderClosure params commit f6499c2676e074a36033627ffc7540107777630d Author: Pascal Schoen <[email protected]> Date: Wed May 18 10:19:57 2016 +0200 Added additional variables for storing parameters in the ShaderClosure struct commit 7100640b65c2ff5447a18c01fc4e93594b4f486a Author: Pascal Schoen <[email protected]> Date: Tue May 17 12:03:17 2016 +0200 added output parameter to the DisneyBsdfNode That has been forgotten after removing the inheritance of BsdfNode commit 419ee5441100a906b4b3fd8373cb768a71bfdfe6 Author: Pascal Schoen <[email protected]> Date: Tue May 17 10:40:48 2016 +0200 removed BsdfNode class inheritance for DisneyBsdfNode That's due to a naming difference. The Disney BSDF uses the name 'Base Color' while the BsdfNode had a 'Color' input. That caused a text message to be printed while rendering. commit 6006f91e8730f78df5874f808690d3908db103ab Author: Pascal Schoen <[email protected]> Date: Wed May 4 16:08:10 2016 +0200 disney implementation cleaned commit 0ed08959141fc7c5f8c6e37c6552ecb9fcc5749c Author: Pascal Schoen <[email protected]> Date: Wed May 4 13:23:07 2016 +0200 added the disney brdf as a shader node commit 0630b742d71c658915575a4a71a325094a0fc313 Author: Pascal Schoen <[email protected]> Date: Tue May 3 16:54:49 2016 +0200 added clearcoat implementation commit 9f3d39744b85619750c79c901f678b8c07fe0ee2 Author: Pascal Schoen <[email protected]> Date: Fri Apr 29 22:56:49 2016 +0200 disney diffuse und specular implemented commit 9b262063767d6b05a617891c967d887d21bfb177 Author: Pascal Schoen <[email protected]> Date: Mon Apr 18 15:21:32 2016 +0200 disney diffuse is working correctly commit 4711a3927dfcadaa1c36de0ba78fc304fac1dc8a Author: Pascal Schoen <[email protected]> Date: Mon Apr 18 08:41:53 2016 +0200 added vessel for disney diffuse shader |
Commit Details:
Full Hash: 316edc16acfa01bc23b9e2c3c2b18e4f43dc3314
Parent Commit: dc3385c
Lines Changed: +2430, -45
9 Added Paths:
/intern/cycles/kernel/closure/bsdf_disney_clearcoat.h (+200, -0) (View)
/intern/cycles/kernel/closure/bsdf_disney_diffuse.h (+138, -0) (View)
/intern/cycles/kernel/closure/bsdf_disney_sheen.h (+143, -0) (View)
/intern/cycles/kernel/closure/bsdf_disney_specular.h (+282, -0) (View)
/intern/cycles/kernel/osl/bsdf_disney_clearcoat.cpp (+98, -0) (View)
/intern/cycles/kernel/osl/bsdf_disney_diffuse.cpp (+100, -0) (View)
/intern/cycles/kernel/osl/bsdf_disney_specular.cpp (+102, -0) (View)
/intern/cycles/kernel/shaders/node_disney_bsdf.osl (+68, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_bsdf_disney.c (+83, -0) (View)
/intern/cycles/kernel/closure/bsdf_disney_diffuse.h (+138, -0) (View)
/intern/cycles/kernel/closure/bsdf_disney_sheen.h (+143, -0) (View)
/intern/cycles/kernel/closure/bsdf_disney_specular.h (+282, -0) (View)
/intern/cycles/kernel/osl/bsdf_disney_clearcoat.cpp (+98, -0) (View)
/intern/cycles/kernel/osl/bsdf_disney_diffuse.cpp (+100, -0) (View)
/intern/cycles/kernel/osl/bsdf_disney_specular.cpp (+102, -0) (View)
/intern/cycles/kernel/shaders/node_disney_bsdf.osl (+68, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_bsdf_disney.c (+83, -0) (View)
25 Modified Paths:
/intern/cycles/blender/blender_shader.cpp (+3, -0) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+49, -0) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+89, -12) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet_multi.h (+37, -11) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h (+141, -3) (Diff)
/intern/cycles/kernel/closure/bsdf_util.h (+104, -0) (Diff)
/intern/cycles/kernel/closure/bssrdf.h (+21, -7) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+27, -10) (Diff)
/intern/cycles/kernel/osl/osl_bssrdf.cpp (+2, -0) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+249, -0) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+7, -1) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/shaders/stdosl.h (+5, -0) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+308, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+10, -1) (Diff)
/intern/cycles/render/nodes.cpp (+118, -0) (Diff)
/intern/cycles/render/nodes.h (+28, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+7, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/NOD_shader.h (+1, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+1, -0) (Diff)
/intern/cycles/kernel/closure/bsdf.h (+49, -0) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+89, -12) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet_multi.h (+37, -11) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h (+141, -3) (Diff)
/intern/cycles/kernel/closure/bsdf_util.h (+104, -0) (Diff)
/intern/cycles/kernel/closure/bssrdf.h (+21, -7) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/kernel/kernel_subsurface.h (+27, -10) (Diff)
/intern/cycles/kernel/osl/osl_bssrdf.cpp (+2, -0) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+249, -0) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+7, -1) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/shaders/stdosl.h (+5, -0) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+308, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+10, -1) (Diff)
/intern/cycles/render/nodes.cpp (+118, -0) (Diff)
/intern/cycles/render/nodes.h (+28, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+7, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/NOD_shader.h (+1, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+1, -0) (Diff)