Blender Git Commit Log

Git Commits -> Revision 248faa2

Revision 248faa2 by Lukas Toenne (opensubdiv-modifier)
June 16, 2015, 12:12 (GMT)
Merge branch 'master' into opensubdiv-modifier

Conflicts:
CMakeLists.txt
SConstruct
build_files/cmake/macros.cmake
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_extensions.h
source/blender/gpu/GPU_material.h
source/blender/gpu/SConscript
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_codegen.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript

Commit Details:

Full Hash: 248faa2430e19aaff378219759855fd73422da1e
Parent Commits: 22b7f05, fa823dc

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