Blender Git Commit Log
Git Commits -> Revision 78ed4e7
Revision 78ed4e7 by Julian Eisel (custom-manipulators) October 7, 2016, 14:15 (GMT) |
Merge branch 'temp_manipulators_core' into custom-manipulators Conflicts: source/blender/editors/interface/resources.c source/blender/editors/space_api/spacetypes.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: 78ed4e7e20312c1cd541795ba2edfd8fffd68056
Parent Commits: 1e0a74f, 59cb21a