Blender Git Loki

Merge branch 'temp_manipulators_core' into custom-manipulators

Conflicts:
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_api/spacetypes.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_init_exit.c
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
source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h

Regions now use a single manipulator-map again

Instead of having multiple manipulator-maps for 2D and 3D manipulators, manipulator-group-types should be tagged as being either 2D or 3D. When it comes to drawing these can be drawn separately.
Note that more work needs to be done here (added some todo marks), but there are probably going to be quite a few issues when merging into custom_manipulators, so will handle these first.

Remove manipulator library for initial core merge

Will continue work on them in 2.8 based custom_manipulators branch, there I can also work on making manipulator drawing based on OpenGL 3.2 core profile.

Rebase wiggly-widgets branch onto blender2.8 branch

This commit adds a new 'custom-manipulators' branch in which changes of the wiggly-widgets branch are applied onto the blender2.8 branch. I've done it so I can start porting manipulator drawing code to use the new abstractions for OpenGL 3.2 core profile.
At some point I had to do it anyway - better earlier than later to reduce loss of git history.
From now on this is the main branch for the custom manipulators project, I'll delete the wiggly-widgets branch in a bit (but keep it available at https://github.com/julianeisel/blender/tree/wiggly-widgets). It's still possible to merge some manipulators for pre-2.8 by rewriting the drawing of those to use OpenGL <= 2.1 (or copy & pasting from earlier state).

Fix 3 bugs causing startup to fail in wiggly-widgets branch

Merge branch 'master' into temp_manipulators_core

Use GPU_glew.h to include glew

Fix manipulator update event define using already used value

Quite old issue even, since 97bb7d0a5ba1cb.

Merge branch 'master' into temp_manipulators_core

Move structs to lower level, avoid storing manipulator-group pointers, naming, etc

Move manipulator-group creation into own function

Remove unused manipulator-map update flag

Avoid include in header file

Add SpaceType.manipulators callback for startup registration of manipulator-maps

Aaaannd the usual cleanup.

Cleanup: Rename manipulator_draw_intern->manipulator_drawinfo_draw

Cleanup: Line length, indentation, etc

Resolve some XXX'es and TODO's

And some cleanup.

Merge branch 'master' into temp_manipulators_core

Avoid bad-level calls to WM_manipulatormap_delete from BKE

Cleanup: Comments