Blender Git Commit Log
Git Commits -> Revision d9ffc99
Revision d9ffc99 by Antonis Ryakiotakis (soc-2014-viewport_fx) September 8, 2014, 16:15 (GMT) |
Merge branch 'master' into soc-2014-viewport_fx I have resolved some differences, for instance selection code which was more or less a stub, to be the same as master. This will have to be fixed later. Conflicts: CMakeLists.txt intern/ghost/CMakeLists.txt intern/ghost/intern/GHOST_SystemWin32.cpp intern/ghost/intern/GHOST_Window.cpp intern/ghost/intern/GHOST_WindowWin32.cpp intern/ghost/intern/GHOST_WindowX11.cpp source/blender/blenlib/BLI_math_matrix.h source/blender/blenlib/intern/math_matrix.c source/blender/gpu/CMakeLists.txt source/blender/gpu/GPU_select.h source/blender/gpu/intern/gpu_buffers.c source/blender/gpu/intern/gpu_draw.c source/blender/gpu/intern/gpu_extensions.c source/blender/gpu/intern/gpu_select.c source/blender/gpu/shaders/gpu_shader_simple_vert.glsl source/blender/nodes/CMakeLists.txt |
Commit Details:
Full Hash: d9ffc99e66d659ac887d801b9cc071b4c3f9b8ab
Parent Commits: 551ebaa, b1490e3