Blender Git Loki
Git Commits -> Revision 26fc7ef
Revision 26fc7ef by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) March 8, 2019, 11:12 (GMT) |
Merge branch 'master' into soc-2018-npr # Conflicts: # release/datafiles/locale # release/scripts/addons # release/scripts/addons_contrib # source/blender/draw/intern/DRW_render.h # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesrna/intern/rna_scene.c # source/tools |
Commit Details:
Full Hash: 26fc7ef55f1584bcf9fd262419f1a3f540c186af
Parent Commits: 0ed5552, cf09a24