http://www.miikahweb.com/feed.php MiikaHweb - Blender Pbr-viewport Branch http://www.miikahweb.com/ MiikaHweb - Blender Pbr-viewport Branch fi Mon, 20 Sep 21 12:07:58 +0000 MiikaHweb RSS contact at miikahweb.com <![CDATA[[f87036e]: the maxz and minz shaders were not being compiled]]> http://www.miikahweb.com/en/blender/git-logs/commit/f87036e8a7dfd7c07af6360518cd4293b21a2632 f87036e
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
the maxz and minz shaders were not being compiled

----------------------------------------
1 Path Changed]]>
Wed, 02 Nov 2016 18:52:15 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/f87036e8a7dfd7c07af6360518cd4293b21a2632Dalai Felinto
<![CDATA[[f8a1255]: Fix left over from merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/f8a1255464951af1c720d1d928314827b46e2c98 f8a1255
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Fix left over from merge

Linux did not mind with them, but luckily Linux is more strict

----------------------------------------
3 Paths Changed]]>
Tue, 01 Nov 2016 21:00:47 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/f8a1255464951af1c720d1d928314827b46e2c98Dalai Felinto
<![CDATA[[01a258f]: Started Velvet support in viewport code.]]> http://www.miikahweb.com/en/blender/git-logs/commit/01a258f829cdb3448b81cfff5a565a12ee672f85 01a258f
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Started Velvet support in viewport code.

----------------------------------------
4 Paths Changed]]>
Thu, 07 Jan 2016 01:42:18 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/01a258f829cdb3448b81cfff5a565a12ee672f85
<![CDATA[[0497b01]: Cleanups to make the patch lean]]> http://www.miikahweb.com/en/blender/git-logs/commit/0497b012a37efb63f876b7c7bf127e60896b84c7 0497b01
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Cleanups to make the patch lean

----------------------------------------
2 Paths Changed]]>
Fri, 21 Oct 2016 12:59:03 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0497b012a37efb63f876b7c7bf127e60896b84c7Dalai Felinto
<![CDATA[[051c9c3]: Make use of new direction_transform_m4v3. Add restriction to...]]> http://www.miikahweb.com/en/blender/git-logs/commit/051c9c39d4d38e385b3bf36c49fe65aaec18a09e 051c9c3
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Make use of new direction_transform_m4v3. Add restriction to the display of show_world_sh.

----------------------------------------
11 Paths Changed]]>
Thu, 28 Jan 2016 15:31:35 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/051c9c39d4d38e385b3bf36c49fe65aaec18a09e
<![CDATA[[06b5508]: Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047^' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/06b5508073e53a50d2c8fc3c76c3104eb0077629 06b5508
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047^' into pbr-merge

----------------------------------------
0 Paths Changed]]>
Thu, 20 Oct 2016 18:16:24 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/06b5508073e53a50d2c8fc3c76c3104eb0077629Dalai Felinto
<![CDATA[[105a1d8]: Huge codebase changes :]]> http://www.miikahweb.com/en/blender/git-logs/commit/105a1d84c43fe462d99ae5c8939ed3c67c127afd 105a1d8
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Huge codebase changes :
- Made ssfx "module" to manage screen space effects applied at material stage
- Moved probe functions to their own module
- Divided Shading glsl file into bits that are gathered when making glsl_material_library making files shorter and more organized
- Moved function generating luts and random texture to gpu_luts.c that will contains all textures needed to acheive some effects.
- GPU_PBR in GPUBuiltin is just a placeholder to trigger the uniform binding

Optimisation / correction :
- GLSL : Number of bsdf sample is now passed via an uniform instead of a #define. This means changing quality settings will no longer recompute every shaders in the scene. But this has a small perf cost.
- GLSL : Hammersley numbers are precalculated and stored inside a texture. This may have a performance impact and I will change it to a static table.
- GLSL : Random per pixel numbers are done using a texture like SSAO.
- GLSL : Lots of parameters (only for pbr) are now defined as uniform and passed at binding stage (this minimize the use of GPU_builtin).
- GLSL : most variables used in sampling algorythm are defined as global variables.
- Bsdf sampling is now using the real algorithm and not the split sum approximation (which was unecessary).

Features :
- Added toon shader support (only point light support).
- Added holdout.

----------------------------------------
46 Paths Changed]]>
Fri, 06 May 2016 13:55:15 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/105a1d84c43fe462d99ae5c8939ed3c67c127afd
<![CDATA[[12c0394]: Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/12c0394a4fe8e447710b726eed5cce682ed05e88 12c0394
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Merge commit '4b046c530d3e14d7737c4770b9ae07942f4c6047' into pbr-merge

Conflicts:
source/blender/nodes/shader/nodes/node_shader_fresnel.c

----------------------------------------
0 Paths Changed]]>
Thu, 20 Oct 2016 18:23:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/12c0394a4fe8e447710b726eed5cce682ed05e88Dalai Felinto
<![CDATA[[1640ea8]: Merge remote-tracking branch 'origin/blender2.8' into pbr-viewport...]]> http://www.miikahweb.com/en/blender/git-logs/commit/1640ea89e55d0bbef6b5c0070b9ccf0b95b807b5 1640ea8
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Merge remote-tracking branch 'origin/blender2.8' into pbr-viewport

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/drawobject.c

----------------------------------------
0 Paths Changed]]>
Fri, 21 Oct 2016 12:29:08 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1640ea89e55d0bbef6b5c0070b9ccf0b95b807b5Dalai Felinto
<![CDATA[[1cd2d7b]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/1cd2d7b744e5b42fdce8e5c7a7faaabad1b78a21 1cd2d7b
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/intern/gpu_shader.c

----------------------------------------
0 Paths Changed]]>
Mon, 04 Apr 2016 22:15:30 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1cd2d7b744e5b42fdce8e5c7a7faaabad1b78a21
<![CDATA[[1eb5ff3]: Exclude Translucent surfaces from shadows.]]> http://www.miikahweb.com/en/blender/git-logs/commit/1eb5ff3bbd0b12489aaa87d64f002e0df8fa2a78 1eb5ff3
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Exclude Translucent surfaces from shadows.

----------------------------------------
1 Path Changed]]>
Sun, 21 Feb 2016 22:01:22 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1eb5ff3bbd0b12489aaa87d64f002e0df8fa2a78
<![CDATA[[20afa77]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/20afa773245f856989dae4cb2a03a261f1f350c0 20afa77
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/editors/space_view3d/drawmesh.c
# source/blender/gpu/CMakeLists.txt
# source/blender/gpu/GPU_draw.h
# source/blender/gpu/GPU_material.h
# source/blender/gpu/GPU_texture.h
# source/blender/gpu/intern/gpu_codegen.c
# source/blender/gpu/intern/gpu_draw.c
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/intern/gpu_shader.c
# source/blender/gpu/intern/gpu_texture.c
# source/blender/makesrna/intern/rna_image_api.c
# source/blender/nodes/shader/nodes/node_shader_vectTransform.c

----------------------------------------
0 Paths Changed]]>
Thu, 28 Jan 2016 13:44:58 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/20afa773245f856989dae4cb2a03a261f1f350c0
<![CDATA[[20fa91b]: Early Hi-Z raytrace implementation (not functional yet)]]> http://www.miikahweb.com/en/blender/git-logs/commit/20fa91bd47967dc525f69573a353694aad05f9b7 20fa91b
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Early Hi-Z raytrace implementation (not functional yet)

----------------------------------------
4 Paths Changed]]>
Tue, 05 Jul 2016 21:56:22 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/20fa91bd47967dc525f69573a353694aad05f9b7
<![CDATA[[22c8301]: Fix Crash.]]> http://www.miikahweb.com/en/blender/git-logs/commit/22c83011a961cb5302f8a8f8b013772b32b8543a 22c8301
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix Crash.

----------------------------------------
1 Path Changed]]>
Wed, 15 Jun 2016 23:46:36 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/22c83011a961cb5302f8a8f8b013772b32b8543a
<![CDATA[[240e995]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/240e99506269377789126f1faf3beec90dfcbfa0 240e995
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

----------------------------------------
0 Paths Changed]]>
Sun, 21 Feb 2016 21:38:57 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/240e99506269377789126f1faf3beec90dfcbfa0
<![CDATA[[3155b44]: Fix backward compatibility.]]> http://www.miikahweb.com/en/blender/git-logs/commit/3155b440bfd8188e4fe4fccd2dd695a63bb76097 3155b44
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix backward compatibility.

----------------------------------------
5 Paths Changed]]>
Fri, 08 Jan 2016 01:30:34 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3155b440bfd8188e4fe4fccd2dd695a63bb76097
<![CDATA[[31d6535]: Fix compilation error]]> http://www.miikahweb.com/en/blender/git-logs/commit/31d65359e84a025f4f510c8c5a4019db61ceecf4 31d6535
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix compilation error

----------------------------------------
2 Paths Changed]]>
Mon, 06 Jun 2016 09:57:49 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/31d65359e84a025f4f510c8c5a4019db61ceecf4
<![CDATA[[371c289]: Made these changes, all relative to the viewport Material mode...]]> http://www.miikahweb.com/en/blender/git-logs/commit/371c289af8f44264854b697fa095425e00d69c70 371c289
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Made these changes, all relative to the viewport Material mode.
-Lamp sizes are now binded with dynamic uniforms
-Added support of Anisotropic Bsdf
-Added support of Glossy Refraction Bsdf
-Added support of Glossy Glass Bsdf
-Texture noise uses the same default coordinates as cycles.
-Vector transform now works with translations (point mode).
-Vector transform now works with translations.
-Transparency for transparent Bsdf now uses the alpha input.
-Lots of code formating
-Default tangent space inside Geometry node
-Added support for Tangent node
-Object Info now output object location correctly

----------------------------------------
18 Paths Changed]]>
Wed, 27 Jan 2016 23:46:08 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/371c289af8f44264854b697fa095425e00d69c70
<![CDATA[[37300f3]: Fix #3 : Clamp mix factor.]]> http://www.miikahweb.com/en/blender/git-logs/commit/37300f330798ec7d2100d7bb2f2413813567aa53 37300f3
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix #3 : Clamp mix factor.

----------------------------------------
1 Path Changed]]>
Sun, 20 Mar 2016 15:12:46 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/37300f330798ec7d2100d7bb2f2413813567aa53
<![CDATA[[44aeca9]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/44aeca90237030287586e7e88ee7d582248956be 44aeca9
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/editors/space_view3d/drawmesh.c
# source/blender/gpu/GPU_extensions.h
# source/blender/gpu/SConscript
# source/blender/gpu/intern/gpu_compositing.c
# source/blender/gpu/intern/gpu_extensions.c
# source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp

----------------------------------------
0 Paths Changed]]>
Wed, 06 Jan 2016 21:14:30 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/44aeca90237030287586e7e88ee7d582248956be
<![CDATA[[418b245]: Merge commit '9269574089a742130f02c0a1184a19d94f0e665d' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/418b24551e1b8a4458deceedca945a631f0684ac 418b245
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Merge commit '9269574089a742130f02c0a1184a19d94f0e665d' into pbr-online

Merge conflicts fixes include fix on ob->reflectionplane for write and
read, and a few manual fixes to account for the ID remap changes

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_draw.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_texture.c
source/blender/gpu/shaders/gpu_shader_vertex_world.glsl

----------------------------------------
0 Paths Changed]]>
Thu, 20 Oct 2016 17:00:49 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/418b24551e1b8a4458deceedca945a631f0684acDalai Felinto
<![CDATA[[4841e60]: Added ambient occlusion support in material]]> http://www.miikahweb.com/en/blender/git-logs/commit/4841e6026164f4bbdee0065579f944b5ab8e940f 4841e60
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Added ambient occlusion support in material
Algorithm is slow but high quality
Added backface buffer to compute per pixel thickness
Sampling quality is passed via uniforms and not via constants : this is a little slower but it does not need to recompile shader every time
Moved some code for organisation.

----------------------------------------
39 Paths Changed]]>
Wed, 25 May 2016 17:12:13 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4841e6026164f4bbdee0065579f944b5ab8e940f
<![CDATA[[4948b6e]: Merge remote-tracking branch 'origin/master' into pbr-merge]]> http://www.miikahweb.com/en/blender/git-logs/commit/4948b6e226bb0352e0a6ead7dadddc33bb43c908 4948b6e
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Merge remote-tracking branch 'origin/master' into pbr-merge

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c

----------------------------------------
0 Paths Changed]]>
Thu, 20 Oct 2016 19:37:36 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4948b6e226bb0352e0a6ead7dadddc33bb43c908Dalai Felinto
<![CDATA[[4aebb28]: Added checkboxes for display options]]> http://www.miikahweb.com/en/blender/git-logs/commit/4aebb28e60e426c2321937ce84bc9fe1c0489e5b 4aebb28
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Added checkboxes for display options

----------------------------------------
10 Paths Changed]]>
Thu, 26 Nov 2015 01:50:33 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4aebb28e60e426c2321937ce84bc9fe1c0489e5b
<![CDATA[[4b08c4d]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/4b08c4d0aeddeec5b1c73b5b94bd08e93acb75e6 4b08c4d
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/shaders/gpu_shader_material.glsl

----------------------------------------
0 Paths Changed]]>
Sun, 14 Feb 2016 13:53:40 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4b08c4d0aeddeec5b1c73b5b94bd08e93acb75e6
<![CDATA[[4cae0cb]: Fix texelFetch for older opengl version.]]> http://www.miikahweb.com/en/blender/git-logs/commit/4cae0cb418660aef4b47b19a0d89168759ddf9b3 4cae0cb
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix texelFetch for older opengl version.

----------------------------------------
7 Paths Changed]]>
Wed, 15 Jun 2016 23:47:07 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/4cae0cb418660aef4b47b19a0d89168759ddf9b3
<![CDATA[[515be07]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/515be07dd4e5ce255c477d9a8fbdba5e44e0b2a5 515be07
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/shaders/gpu_shader_material.glsl

----------------------------------------
0 Paths Changed]]>
Mon, 11 Apr 2016 19:24:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/515be07dd4e5ce255c477d9a8fbdba5e44e0b2a5
<![CDATA[[52cb298]: Fix layer weight and light's geometry nodes]]> http://www.miikahweb.com/en/blender/git-logs/commit/52cb2981c410f542f7695fdaf76547d383c26daf 52cb298
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix layer weight and light's geometry nodes

----------------------------------------
3 Paths Changed]]>
Sun, 14 Feb 2016 21:32:30 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/52cb2981c410f542f7695fdaf76547d383c26daf
<![CDATA[[554952d]: Remove SSR distance]]> http://www.miikahweb.com/en/blender/git-logs/commit/554952d1141018430d3e37b0d0c121110ce9834d 554952d
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Remove SSR distance
Fixed Vertex shader not compiling for world nodetree

----------------------------------------
8 Paths Changed]]>
Sun, 05 Jun 2016 17:45:50 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/554952d1141018430d3e37b0d0c121110ce9834d
<![CDATA[[579d167]: Fixing area light orientation.]]> http://www.miikahweb.com/en/blender/git-logs/commit/579d16714f425d27a3ac9fe4ec19d8f36b4c5f97 579d167
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fixing area light orientation.

----------------------------------------
3 Paths Changed]]>
Sun, 15 May 2016 15:37:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/579d16714f425d27a3ac9fe4ec19d8f36b4c5f97
<![CDATA[[59295b9]: Fixing problems with macOSX opengl. Thanks to Marcelo Varanda...]]> http://www.miikahweb.com/en/blender/git-logs/commit/59295b91264f82f1d4ff0fc7fc49a3417c70f9f1 59295b9
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fixing problems with macOSX opengl. Thanks to Marcelo Varanda.

----------------------------------------
1 Path Changed]]>
Wed, 20 Jan 2016 00:36:27 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/59295b91264f82f1d4ff0fc7fc49a3417c70f9f1
<![CDATA[[655cfca]: Implemented SSR :]]> http://www.miikahweb.com/en/blender/git-logs/commit/655cfca4524fc8295cb7ead9f2ccaf4f79d3f221 655cfca
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Implemented SSR :
- Still pretty rough implementation does only works with sharp glossy shader
- No Glossy reflection
- 2 algorithm but only one acheive decent results the other needs to be debuged.

Changed pbr settings location :
- They are now stored in structs like the FX options

----------------------------------------
26 Paths Changed]]>
Tue, 03 May 2016 17:41:41 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/655cfca4524fc8295cb7ead9f2ccaf4f79d3f221
<![CDATA[[669c280]: 'gmon.out' should have never been here]]> http://www.miikahweb.com/en/blender/git-logs/commit/669c2801c0c2048e32eac0a9fc31ce4d664a63bd 669c280
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
'gmon.out' should have never been here

----------------------------------------
1 Path Changed]]>
Fri, 21 Oct 2016 12:51:27 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/669c2801c0c2048e32eac0a9fc31ce4d664a63bdDalai Felinto
<![CDATA[[6d33b10]: Fix bug #1]]> http://www.miikahweb.com/en/blender/git-logs/commit/6d33b1031a8d32778a4ee0cf78e7240ac8e90ea9 6d33b10
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Fix bug #1

----------------------------------------
1 Path Changed]]>
Sun, 31 Jan 2016 20:40:19 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/6d33b1031a8d32778a4ee0cf78e7240ac8e90ea9
<![CDATA[[6ebbef4]: Merge branch 'master' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/6ebbef4724dd7d6f09677d5cd871042a44f8008c 6ebbef4
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/intern/gpu_draw.c
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/makesdna/DNA_view3d_types.h
# source/blender/nodes/shader/nodes/node_shader_normal_map.c
# source/blender/nodes/shader/nodes/node_shader_tex_environment.c
# source/blender/nodes/shader/nodes/node_shader_tex_image.c
# source/blender/nodes/shader/nodes/node_shader_tex_noise.c
# source/blender/nodes/shader/nodes/node_shader_texture.c

----------------------------------------
0 Paths Changed]]>
Mon, 30 May 2016 18:09:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/6ebbef4724dd7d6f09677d5cd871042a44f8008c
<![CDATA[[6f81e80]: Merge commit '2b240b0430787814316f3b3166453c6d85b017f3' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/6f81e808e3e4d9ab6a82fbe27c95e180cb7de170 6f81e80
Branches : pbr-viewport
Author : Dalai Felinto (dfelinto)
----------------------------------------
Merge commit '2b240b0430787814316f3b3166453c6d85b017f3' into pbr-merge

Conflicts:
release/datafiles/splash.png
release/datafiles/splash_2x.png
source/blender/gpu/CMakeLists.txt
source/blender/gpu/intern/gpu_shader.c

----------------------------------------
0 Paths Changed]]>
Thu, 20 Oct 2016 17:44:51 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/6f81e808e3e4d9ab6a82fbe27c95e180cb7de170Dalai Felinto
<![CDATA[[7750dea]: Last minute changes :]]> http://www.miikahweb.com/en/blender/git-logs/commit/7750dea70e41a050bcf0e494d810bab93349cabd 7750dea
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Last minute changes :
- Changed splash
- Added bypass for lamps diffuse and specular contribution
- Added probe related operators

Signed-off-by: Clément Foucault <foucault.clem@gmail.com>

----------------------------------------
10 Paths Changed]]>
Mon, 11 Apr 2016 17:59:29 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7750dea70e41a050bcf0e494d810bab93349cabd
<![CDATA[[7c777fe]: Oren-nayar Diffuse & Velvet Shader Environment lighting support...]]> http://www.miikahweb.com/en/blender/git-logs/commit/7c777fe0383304219ab47251e2fe437d0ba90a7f 7c777fe
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Oren-nayar Diffuse & Velvet Shader Environment lighting support.

----------------------------------------
3 Paths Changed]]>
Sat, 16 Apr 2016 10:54:40 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7c777fe0383304219ab47251e2fe437d0ba90a7f
<![CDATA[[7e0cb40]: Giving user more control over the shadows. Enabling shadows...]]> http://www.miikahweb.com/en/blender/git-logs/commit/7e0cb40b4852a17142ac07c8c57ffce0c471902f 7e0cb40
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Giving user more control over the shadows. Enabling shadows for Area lamps.

----------------------------------------
3 Paths Changed]]>
Sun, 21 Feb 2016 20:09:27 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7e0cb40b4852a17142ac07c8c57ffce0c471902f
<![CDATA[[7e4d937]: Started adding beckmann distribution.]]> http://www.miikahweb.com/en/blender/git-logs/commit/7e4d9377180889528209f05d847bb23ecc6da5d9 7e4d937
Branches : pbr-viewport
Author : Unknown ()
----------------------------------------
Started adding beckmann distribution.
Improved Sun disk equations.
Adde Tried Ray aligned disk intersection to match cycles
but it's not working on microfacet bsdf for now.

----------------------------------------
8 Paths Changed]]>
Sat, 21 May 2016 10:58:39 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7e4d9377180889528209f05d847bb23ecc6da5d9