Blender Git Commits

Merge branch 'wiggly-widgets' into UI-experiments

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

Merge branch 'master' into UI-experiments

Conflicts:
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_intern.h

Rework widget UserPref options

Improved naming and tooltip descriptions, removed unnecessary options

Fix manipulator not scaling correctly in 3D widgets drawing mode

Merge branch 'master' into wiggly-widgets

Rename manipulator_widget.c (tmp name)->transform_manipulator.c (old name)

Remove (hopefully) all leftovers from old manipulator

Fix wrongly allocated memory, cleanup

Renamed 'draw' callback to 'create' callback as it doesn't draw anything, instead it initializes and sets up data.

Make color a property for all widgets, not only for certain widget types

Tweaking colors again, yellow highlight color was a bit too aggressive

Instead, we now draw the manipulator with some transparency and without if highlighted. This also helps making the manipulator not so 'in your face'-ish.

Use widget library for drawing cube widgets

Meaning we also draw it using buffer drawing.

Tweaks for combined manipulator types with 2-axes constrained widgets

Now works as follows with combined manipulator types:
Translate+Rotate: 2-axes widgets hidden
Scale+Rotate: 2-axes widgets hidden
Translate+Scale: Use 2-axes widgets from translate, hide scale ones
Tranlate+Scale+Rotate: 2-axes widgets hidden

We can of course still change behavior later, but would like to get user feedback for this.

Fix jumping/wrongly offset 2-axes constrained widgets

Fix crash on render

New manipulator widgets for 2-axes constrained transform

Used for translate and scale manipulator. Still needs some polish but it's working :)

Looking like this right now: F227012

Final fix for a completely working new manipulator!

(hopefully)

Fixes crash when leaving window bounds with cursor.

Seems that new manipulator is now completely working and stable. Next step is to add some new manipulator features :)

Fix active widget jittering while translating using manipulator

Object matrices aren't updated yet, when we draw manipulator widget while transforming.

Get manipulator handling to work!

Meaning manipulator finally does what it's supposed to do.

There is still a crash when leaving active window while transforming, and drawing of dragged widget is also a bit jiggly, but everything else seems to work :)

Merge branch 'master' into wiggly-widgets

Minor correction to manipulator arrow widgets

To avoid overlapping widgets (would ideally be handled by widget drawing code directly).