Blender Git Commits

Add shader files to the source tree. It helps by displaying them in the
IDE

Merge branch 'master' into viewport_experiments

Merge branch 'master' into terrible_consequencer

Conflicts:
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_ops.c

Trim tool:

Support metastrips and multiple strips at once.

WIP support for meta trimming

Merge branch 'master' into terrible_consequencer

Hook widget event to the lamp operator.

Hook calling widget to operator event system. Alpha alpha code still.
Transform/lamp still don't process those.

Store the active widget in the context. This allows us to first call the
widget handler if needed.

Arrow handler that does something useful (tm). However still not hooked
up to operators.

Dummy handler for arrows, take care of some allocation issues for
operators.

Add callbacks for operator initialization. Now a widget will directly
call an operator and have its own handlers for input.

No handlers implemented yet.

Classic fix linking of the widget library.

Merge branch 'master' into wiggly-widgets

More API reorganization

WIP commit, basically introducing a few things here:

* highlighted vs active widget.

Active widget takes all input and basically highjacks drawing of all
other widgets in the widgetmap.

* operator names for widgets. Now widgets will spawn operators based on
names that are passed on them. They will also modify a named property of
the operator and pass it on, after which operator can process it.

Manipulator:

* Fix error in plane manipulator handling.
* Don't show manipulator widgets on paint modes.

Only detect active widget on mousemoves. Now handler operates on
mouseclick (bound to change)

Merge branch 'master' into wiggly-widgets

Ring widgets:

Add a clipping style, just like manipulator