Blender Git Commit Log

Git Commits -> Revision f6416b9

March 17, 2014, 16:48 (GMT)
more merge conflict resolution from 9822428f6c2e4e279241f856886d7df5fa2cd144

Commit Details:

Full Hash: f6416b94a538bbcb834a9b153d1304938bc224a0
Parent Commit: 9822428
Lines Changed: +72, -52

33 Modified Paths:

/intern/ghost/intern/GHOST_WindowWin32.h (+2, -0) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+1, -0) (Diff)
/source/blender/blenfont/BLF_translation.h (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_ghash.h (+1, -0) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+2, -0) (Diff)
/source/blender/editors/armature/armature_utils.c (+2, -0) (Diff)
/source/blender/editors/curve/editcurve.c (+2, -0) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+1, -1) (Diff)
/source/blender/editors/include/ED_armature.h (+1, -1) (Diff)
/source/blender/editors/interface/interface_draw.c (+3, -5) (Diff)
/source/blender/editors/interface/interface_panel.c (+2, -0) (Diff)
/source/blender/editors/mask/mask_draw.c (+2, -0) (Diff)
/source/blender/editors/mesh/CMakeLists.txt (+0, -1) (Diff)
/source/blender/editors/screen/CMakeLists.txt (+0, -1) (Diff)
/source/blender/editors/space_clip/tracking_ops.c (+2, -0) (Diff)
/source/blender/editors/space_file/file_intern.h (+4, -2) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+2, -2) (Diff)
/source/blender/editors/space_image/CMakeLists.txt (+1, -2) (Diff)
/source/blender/editors/space_view3d/CMakeLists.txt (+0, -1) (Diff)
/source/blender/editors/space_view3d/drawanimviz.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+9, -6) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+6, -6) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+0, -2) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+5, -4) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+1, -1) (Diff)
/source/blender/gpu/GPU_material.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+10, -5) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021