Blender Git Commits

Merge branch 'master' into wiggly-widgets

Allow de-selecting Face Maps

Using de-select all for bones now de-selects all face maps, too.

Correction to recent commit, bone face map wasn't written to .blend

Initial steps for a connected bone and face map selection

Now, when a face map is selected, all bones it is assigned to are selected as well. If this will stay in final design is not sure yet, but the logic added will be needed anyway (likely).

Support reading Face Map assignments from .blend, corrections to previous commit

Rework workflow for connecting Face Maps and bones

Previously, a Face Map was 'connected to a bone' by giving it the same name as the Face Map, and assigning the armature which includes the bone to the object's Face Map using an Armature modifier. This was pretty unintuitive and tiresome to set up and it also brought some technical issues (there was no nice way to find a Face Map assigned to a bone from the bone - this means we couldn't use Face Maps together with bones in pose mode as current design approach would require).

So finally I came up with a new approach:
The bone context in the Properties Editor got a new panel "Face Maps". In this panel there is a search button to choose an object. After an object is chosen, a Face Map from this object can be chosen using a second search button. That means a user can assign a Face Map to a bone directly, without having to worry about the armature.

This approach currently has the limitation that only one Face Map can be assigned to a bone (a Face Map can be used by multiple bones though). This means we can later use one Face Map to manipulate multiple bones, but we can't use multiple Face Maps to manipulate one bone.
Anyway, this could be changed easily later, but I'd rather avoid this since it complicates the UI/workflow again.

----

Old code is kept.
Also includes minor cleanup.

Really minor cleanup

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/interface/resources.c
source/blender/editors/space_graph/space_graph.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/transform/transform_manipulator.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