Blender Git Loki
Git Commits -> Revision 401cdb3
Revision 401cdb3 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) June 13, 2018, 14:27 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/space_view3d.py source/blender/blenkernel/intern/gpencil.c source/blender/editors/gpencil/gpencil_data.c source/blender/editors/gpencil/gpencil_paint.c source/blender/editors/space_view3d/view3d_manipulator_ruler.c source/blender/editors/space_view3d/view3d_ruler.c source/blender/makesrna/intern/rna_main_api.c |
Commit Details:
Full Hash: 401cdb36f8d8578a6173a26abf461d7b4bb9da6b
Parent Commits: 29bf8d4, cd0a483