Blender Git Commit Log

Git Commits -> Revision c326d40

Revision c326d40 by turjuque (pbr-viewport)
January 6, 2016, 21:19 (GMT)
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

Commit Details:

Full Hash: c326d403d8e74e8ba38e4107024d4decac4425bf
Parent Commits: 44aeca9, 83aeba9

By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021