Blender Git Loki

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

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

Added support for custom number of samples for brdfs.

Fix layer weight and light's geometry nodes

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

Tangent node support in GLSL (only with selected uv)

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

# Conflicts:
# source/blender/gpu/GPU_texture.h

Fix bug #1

Make use of new direction_transform_m4v3. Add restriction to the display of show_world_sh.

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

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

Fixing problems with macOSX opengl. Thanks to Marcelo Varanda.

Fix sun intensity and fix a bug for some graphics cards.

Using the brdf path for default material. And fixing stuff.

Fixing Glass shader color.

Fix backward compatibility.

Started Velvet support in viewport code.

Making things work again

Merge branch 'master' of github.com:Hypersomniac/blender-shader

# Conflicts:
# source/blender/gpu/GPU_material.h
# source/blender/gpu/SConscript
# source/blender/gpu/intern/gpu_compositing.c
# source/blender/gpu/intern/gpu_extensions.c
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
# source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp

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

PRB viewport : Adding lamp support and post effects. and lots of gpu stuff.
No more leaks.