Blender Git Loki
Git Commits -> Revision 525c903
Revision 525c903 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 4, 2019, 11:14 (GMT) |
Merge remote-tracking branch 'origin/master' into soc-2018-npr # Conflicts: # release/datafiles/locale # release/scripts/addons # release/scripts/addons_contrib # release/scripts/startup/bl_ui/properties_scene.py # source/blender/draw/intern/draw_manager_texture.c # source/blender/makesdna/DNA_scene_types.h # source/blender/makesrna/intern/rna_scene.c # source/tools |
Commit Details:
Full Hash: 525c9034cd77e22d9307f3813c47a314269dda73
Parent Commits: a08bf33, c384b5d