Blender Git Commits

Merge branch 'temp_manipulators_core' into wiggly-widgets

Had to merge again to port over fixes from temp_manipulators_core.

Conflicts:
source/blender/editors/space_api/spacetypes.c

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

Make branch compile again after latest changes in temp_manipulators_core

Merge branch 'temp_manipulators_core' into wiggly-widgets

Conflicts:
source/blender/blenkernel/BKE_screen.h
source/blender/editors/space_api/spacetypes.c
source/blender/makesdna/DNA_view3d_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c

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

Merge branch 'master' into wiggly-widgets

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

Merge branch 'master' into wiggly-widgets