Blender Git Commits

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_material.h

Merge branch 'master' into object_nodes

Always initialize cache path.

partial fix for displacement / autohide flicker problem, happens now only with automerge (occasionally) and with automerge + fix normals (regularly), but for displacement and glass you mostly need only autohide; automerge and fix normals are for smooth objects where cracks should be nearly invisible (after fracturing)

Merge branch 'master' into 'cvdb_ray_isect'

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/render/svm.cpp
intern/cycles/render/svm.h

Reusable functions for copying a set of nodes and calculating node bounds.

Various cleanups.

Merge branch 'master' into temp_display_optimization

added an autohide filter group, its helpers can be used to animate revelation of cracks which are hidden otherwise. This is basic revelation functionality via object locations and sizes only.

Added an optional update callback for the configurable object node ID property.

Port wmWidget struct to lower-level C++ class

Main changes here are moving wmWidget to windowmanager/widgets/wm_widget.h, making it a class with private members, and adding/adjusting needed _get/_set API calls. To avoid lots of noise in code, D1697 is applied.
And of course there is some cleanup too.

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/kernel/osl/osl_services.cpp

editmesh VBO: support deformed vertex coordinates too.

Merge branch 'master' into temp_display_optimization

Conflicts:
source/blender/blenkernel/intern/editderivedmesh.c

'Make Group' operator (ctrl+g) to easily create a node group from selected nodes.

Use a unified list for simplifying socket identifiers and matching RNA struct types.

Fix compiler warning from illegal zero-initialization in C++0x.

ID.flag has been split to put runtime tags in a separate field (rB3fcf535d).

Merge branch 'master' into object_nodes

Conflicts:
source/blender/depsgraph/intern/depsgraph_build_nodes.cc
source/blender/depsgraph/intern/depsgraph_build_relations.cc