Blender Git Loki
Git Commits -> Revision 6e85ac1
Revision 6e85ac1 by Julian Eisel (temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, UI-experiments, wiggly-widgets) July 23, 2015, 23:25 (GMT) |
Painfully merge branch 'master' into wiggly-widgets Conflicts: source/blender/blenkernel/BKE_DerivedMesh.h source/blender/blenkernel/intern/subsurf_ccg.c source/blender/editors/space_sequencer/sequencer_intern.h source/blender/gpu/GPU_buffers.h source/blender/gpu/intern/gpu_buffers.c source/blender/makesdna/DNA_armature_types.h source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: 6e85ac1ee0423d389c71bf5bd2ca25e962aa7568
Parent Commits: b8481f4, c066dde
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021