Blender Git Commit Log

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