Blender Git Commits

Fix compile issues after merging

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_wm.c

Fix incorrect color of axes on "Reset to Default Theme"

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

Fix Blenderplayer not compiling....

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

Move manipulator drawing for new viewport into own function, add comments

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

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c

Merge branch 'blender2.8' into temp_manipulators_core

Apply patch on blender2.8 branch

Ended up just deleting temp_manipulators_core branch and recreating it from blender2.8 branch. Applied D2232 on it then.

Bring back stuff removed in temp_manipulators_core

Was removed for merge into blender2.8, but we still need it in this branch.

Merge branch 'temp_manipulators_core' into custom-manipulators

Conflicts:
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h

Remove unneeded UserPref options

At least initial merge we don't need them.

Remove any remaining OpenGL calls

This branch is likely going to be merged into blender2.8 branch soon so I rather avoid any OpenGL code that might need to be rewritten later.

Cleanup: Comments

Remove DNA_manipulator_types.h for now

At least for initial merge we don't need anything in DNA (and I'm not sure how DNA structs are handled which are not explicitely saved to disk... does it still store some info about it?).

Fix selected manipulators only drawn while hovering

Fix a few memory leaks due to double allocation

Make manipulators work with changes from last merge