Blender Git Loki
Git Commits -> Revision b706b74
Revision b706b74 by Julian Eisel (custom-manipulators) October 16, 2016, 19:19 (GMT) |
Merge branch 'blender2.8' into custom-manipulators Conflicts: source/blender/editors/interface/resources.c source/blender/editors/space_api/spacetypes.c source/blender/editors/space_view3d/view3d_draw.c source/blender/makesdna/DNA_userdef_types.h source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/WM_api.h source/blender/windowmanager/manipulators/WM_manipulator_api.h source/blender/windowmanager/manipulators/WM_manipulator_types.h source/blender/windowmanager/manipulators/intern/wm_manipulator.c source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c |
Commit Details:
Full Hash: b706b745cebbcabbe2e279e497687e7a2a71fa61
Parent Commits: 196654a, c21122f