Blender Git Commits

Oren-nayar Diffuse & Velvet Shader Environment lighting support.

Fix bug when capturing object with planar reflections.

Merge branch 'master' of git://git.blender.org/blender

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

Last minute changes :
- Changed splash
- Added bypass for lamps diffuse and specular contribution
- Added probe related operators

Signed-off-by: Cl�ment Foucault <[email protected]>

Fixed color correction post process.

Signed-off-by: Cl�ment Foucault <[email protected]>

Fixed Probe unlinking on refresh.

Fix crash with world preview & icons.

Merge branch 'master' of git://git.blender.org/blender

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

Planar Probe, Probe options, Probe Parallax :
- Added Planar Reflections and Refractions:
Rough planar reflection/refraction are roughly approximated by blurring with the microfacet normal direction. We blend to a fallback cubemap for high roughness. They are also displaced using the viewnormals. This last deformation is divided by the distance to the shaded point and multiplied by the distance to the reflection plane to get contact reflections.

- Added options to probes.
Probe can now only render their layers. Diffuse can be disabled (in case of use with a lightmap). Added Operator to manualy update probes.

- Probe parallax:
Correct the rays to project it to the chosen volume (unit cube or sphere) after being corrected by the obj mat (either own or external).

- Probe updates are a bit more consistent.

- Moved PBR light UI from Cycles to Blender sources.

- Added versioning code to update old file with non breaking defaults.

Signed-off-by: Cl�ment Foucault <[email protected]>

Fixed crash when world is absent.

Fix compilation issue on linux.

Changed Splash version number

Fix #3 : Clamp mix factor.

Removing some debug printf

Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# release/datafiles/splash.png
# release/datafiles/splash_2x.png
# source/blender/gpu/GPU_material.h
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/makesrna/intern/rna_image_api.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
# source/blender/nodes/shader/nodes/node_shader_fresnel.c
# source/blender/nodes/shader/nodes/node_shader_layer_weight.c
# source/blender/nodes/shader/nodes/node_shader_normal_map.c

Viewport Probe capture for bsdf preview:

- Added a GPUProbe generated by either the world or objects in the scene.
Updating is done by tagging the GPUProbe and waiting the gpu_update_probes call.
All probes are updated if the world changes and all objects probes are updated if an object in the scene changes. This must be optimize to ensure good performance with lots of probes.
For the moment no settings are available.

- Separated bsdf sampling code inside a new file.

- Spherical harmonic computation is now done on the GPU. Using only 64*64*6 samples for now.

- Lots of code cleaning and formating.

Exclude Translucent surfaces from shadows.

Merge branch 'master' of git://git.blender.org/blender

Giving user more control over the shadows. Enabling shadows for Area lamps.

Merge branch 'master' of git://git.blender.org/blender