Blender Git Loki

Correction to buildbot config...

Revert to 000dfc0319, with reduced featureset in buildbot config.

Debug print for T46412, take tow: ConvertDepthToRadiusOperation seems to work OK, now check VariableSizeBokehBlurOperation...

Revert "Debug commit for T46412."

This reverts commit 6555c5fd7604c384c0ea30c75db2f7df7b64b131.

Merge branch 'master' into mesh_samples

Merge branch 'master' into experimental-build

Debug commit for T46412.

Merge branch 'master' into experimental-build

Create expression return values based on node tree outputs.

Invoke the BVM expression eval for effectors.

Fix T46403: motion tracking not workig with Xcode 7 on OS X.

Caused by use of the uninitialized shape_ variable in Resize().

Revert "Fix T46406: Cycles ignores default socket value associated with group socket"

Fixes T46442.

Fix: Apply same fix from previous commit to the equivalent logic used for GP Sculpt editing

Fix: The "transform strokes on unkeyed frame creates new frame" feature didn't work on the first frame

As a convenience feature, it is possible to jump to a frame without any existing
GP keyframe, and just use the transform tools to modify the stroke to create a new
keyframe on that frame. However, if the current frame was before the first GP keyframe,
the newly created keyframe would not work (if you scrub away), as it was getting
incorrectly added at the end of the list of keyframes, instead of in-order as expected.

Fix: When reloading files, stroke editmode was getting disabled

This commit should bring the logic here more into line with what's done for
the posemode toggle.

There's still some weirdness here when clicking on "Object Mode" vs "Edit Strokes"
(i.e. both will just always toggle!), and old files with GP EditMode won't get
the state synced with ob->mode yet.

Fixes for using tablet events in keymap

* Need to classify tablet events as being in the "mouse" category, or else attempts
to add a new keymap item for this will fail by reverting to keyboard input

* Made event matching more restrictive - it will now trigger only on a tablet events
for LEFTMOUSE events. The problem was that, even when hovering over the tablet
and pressing a key, you'd still get an event with tablet data, which meant that
that event would get wrongly caught and handled.

Integration of BVM into the effector system for using programmable expressions there.

Fix/Workaround T46431: blender-softwaregl crashes

Order of initialization bug only impacted mesa's software-gl.

For now effectively revert support for glx-context-flags.

Use a dedicated struct EffectorContext for storing results of effector
lookup rather than a plain ListBase.

This paves the way for future inclusion of evaluation context info in
the EffectorContext struct, and hides some of the annoying details of
the ListBase double dereferencing.

fixed manta density inflow grid and removed unneeded manta pp gui files