Blender Git Commits

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/glutil.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_manipulator.c

GPencil: Usability Tweaks to "Onion Skins" toggle on header

* The state of this toggle now reflects whether onion skinning is enabled on
any layer, instead of just the active layer. This is handy if there's more than
one GP datablock being shown in the scene, and you need to track down whether it's
the current GP datablock that has a layer with this enabled

* Disabling the toggle now turns off onion skinning on ALL layers at the same time.
This makes it much faster to turn off onion skinning if you've got it enabled
on several layers and would now like to disable it (e.g. for a "clean" pass over
the anim)

* Toggling this button still enables onion skinning for just the active layer,
since that's the one you're most likely to want to see these for (i.e. the character
outlines are on this layer, but some of the background elements are animated, and you
don't really want to see those ghosted)

Merge branch 'master' into id-remap

Merge branch 'master' into object_nodes

GPencil Dopesheet: Filtering option to only include GPencil layers related to the active scene

As requested by the Caminandes team, in the "Grease Pencil" mode of the dopesheet,
it is now possible to view only the Grease Pencil blocks+layers which come from the
active scene and/or the objects in that scene. This is useful when working with
multiple scenes, or when there are many other GPencil datablocks in the file for
various editors that aren't visible.

To use, enable the 'Active Only' toggle with the scene icon (located beside the
Summary toggle). By default, this is not enabled, so that backwards comptability
with old files is not affected (i.e. users are less likely to why they are no longer
able to see keyframes that would've previously been easily visible).

Minor edits - enable dissolve by default

Support dissolving vertices created by tessellated edges

This needs to be done using different logic for boolean operations to ensure its not creating 2-sided faces.

Also make dissolve and separate into options (mainly for testing/debugging).

Allow to switch between bmesh and carve boolean from the modifier UI

Merge branch 'master' into bmesh-boolean-experiment

Simple node for concatenating 2 meshes into one.

Ignore nodes that don't have the 'compile' method, to allow frames.

Buildbot: Make header parse function more available

use context for file open (wont complain of not closing)

Buildbot: Avoid subprocess call to get build info

Add find_library_static, use instead of `gcc -print-file-name`

Added back automatic type conversion.

Now automatic type conversion for sockets happens in the python code.

Buildbot: Some cleanup to minimize difference against master

Merge branch 'master' into buildbot_linux_cmake

Merge branch 'master' into buildbot_linux_cmake

Cleanup to address feedback from Campbell