Blender Git Commit Log

Git Commits -> Revision 2d93fa6

April 6, 2018, 08:37 (GMT)
Try to fix the merge problems.

Warning: Now this source code does not compile

Commit Details:

Full Hash: 2d93fa6231453d2e28b66ec241de426168507dd3
Parent Commit: 987b601
Lines Changed: +28, -33

9 Modified Paths:

/source/blender/editors/gpencil/gpencil_brush.c (+1, -2) (Diff)
/source/blender/editors/gpencil/gpencil_data.c (+2, -6) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+16, -16) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_icons.c (+1, -1) (Diff)
/source/blender/editors/object/object_edit.c (+2, -4) (Diff)
/source/blender/editors/object/object_modifier.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+2, -0) (Diff)
/source/blender/editors/undo/ed_undo.c (+1, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021