Blender Git Loki
Git Commits -> Revision 5354c80
Revision 5354c80 by Joshua Leung (experimental_gp_weight, greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval, temp-greasepencil-object-stacksplit, temp-greasepencil-vfx) November 9, 2017, 22:43 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/blenloader/intern/readfile.c source/blender/depsgraph/intern/builder/deg_builder_nodes.cc source/blender/draw/modes/object_mode.c source/blender/editors/include/ED_gpencil.h source/blender/editors/space_view3d/view3d_draw_legacy.c |
Commit Details:
Full Hash: 5354c800374d5c41f4d8fa0f562f315fc98ae002
Parent Commits: 464eb5b, 7defb27