Blender Git Commits

Merge branch 'wiggly-widgets' into UI-experiments

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c

Merge branch 'master' into UI-experiments

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/intern/wm_init_exit.c

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/intern/wm_init_exit.c

Bunch of minor cleanup

Initial support for custom keymaps per widget group

This adds widget-group level, configurable keymaps. This means, for each widget group (e.g. Manipulator Widgets, Camera Widgets, etc), 6 keymap entries are added:
* Widget Activate (action-mouse down)
* Widget Activate (actually deactivate - action-mouse up)
* Widget Tweak (mouse move)
* Widget Tweak Cancel (RMB)
* Widget Tweak Cancel (esc)
* Widget Select (only for selectable widgets - select-mouse)

This might be useful e.g. to set certain widgets to activate on tweak event only to resove conflicts (see manipulator vs. selection with LMB-select conflict), and for things like setting a widget values using shortcuts (not yet possible, but easy to add now).
Further, this greatly improves the IMHO current ugliest part of the widget backend, the event system part/hack :P o/

One remaining issue is that the keymap items only appear using search, they are not displayed in the keymap editor list by default (didn't investigate yet).

Old functionality was ported over to new system, everything should work fine still.

Support selecting widgets and use for facemap widgets

This means widgets flagged as selectable - like facemap widgets - can be selected using RMB (currently hard-coded). This means they stay visible until they are deselected by pressing RMB again, or by selecting a different facemap.

Draw facemap widgets with multi-sampling

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c

Draw focal length widget with camera aspect

A bit stupid that we mix some special stuff for cone (plane in fact) style drawing into regular arrow widget drawing, still would like to use plane widget for this, but first need to pack arrow handling into more generic functions, since arrow & plane widgets would need almost the same handling.

Fix initialization of tweaked theme colors after last merge

Fix memory leak for widgets w/o own interaction handling

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/BKE_blender.h

Cleanup: Use ME_POLY_TRI_TOT macro

Fix memory leak in facemap drawing

There's still some memory weirdness going on, but haven't found out what causes it yet.

Fix memory leak in manipulator code

Fix facemap drawing crash

Issue was that MPoly wasn't reset after iterating.

Fix old graph editor crash

Fix some potential bugs in facemap drawing code

Merge branch 'master' into wiggly-widgets