Blender Git Loki
Git Commits -> Revision 63ea3ff
Revision 63ea3ff by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 28, 2019, 15:13 (GMT) |
Merge branch 'master' into greasepencil-object Conflicts: source/blender/draw/engines/gpencil/gpencil_engine.c source/blender/draw/engines/gpencil/gpencil_engine.h source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl |
Commit Details:
Full Hash: 63ea3ffa263cdf0a5caea0f68fe9009f4506acb0
Parent Commits: 07c6221, 18c4386