Blender Git Loki
Git Commits -> Revision 3d3cc30
Revision 3d3cc30 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) April 17, 2018, 16:28 (GMT) |
Merge branch 'blender2.8' into greasepencil-object Tempting fate by merging in the Game Engine removal in here too... We might as well do this now though, since it'll have to happen at some time anyway! # Conflicts: # release/scripts/startup/bl_ui/properties_scene.py # source/blender/blenkernel/intern/object.c # source/blender/blenloader/intern/versioning_280.c # source/blender/gpu/CMakeLists.txt # source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: 3d3cc30df489f6729cd626edaf30b0e5e065779c
Parent Commits: 49f7ca3, 6d07956