Blender Git Loki

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/render/nodes.cpp
intern/cycles/util/CMakeLists.txt

Fix for new libquery callback API.

(Un-)Register widgets attached to modal operator with the operatortype

We have some widgets-groups that are attached to modal operators, meaning, they are only visible (actually accessible) as long as the modal OP runs. I simplified the process of setting those up by adding a wmWidgetGroupType pointer to wmOperatorType struct. If you assign a value to it, everything else is handled by widget system.

Also, previously key map entries for widget-groups attached to modal OP's were only visible while the OP ran, since it was registered and unregistered during OP runtime. This is fixed, since they are now (un-)registered with the OP-type.

Merge branch 'libquery-recursive' into id-remap

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

Merge branch 'libquery-recursive' into asset-engine

Rework library_query foreach looper - add optional recursivity.

This commit:
* Fixes bad handling of 'stop iteration' (by adding a status flag, so that we can actually
stop in helper functions too, and jumping to a finalize label instead of raw return, to
allow propper clean up).
* Adds optional recursion into 'ID tree' - callback can also decide to exclude current id_pp
from recursion. Note that this implies 'readonly', modifying IDs while recursing is not
something we want to support!
* Changes callback signature/expected behavior: return behavior is now handled through flags,
and 'parent' ID of id_pp is also passed (since it may not always be root id anymore).

Used this new recursive behavior in ID preview generation as an example, still needs more testing!

Merge branch 'master' into asset-engine

Register widgets & drop boxes together with operator types

Avoids looping twice.

Merge branch 'master' of git://git.blender.org/blender

Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/shaders/gpu_shader_material.glsl

Decklink: OSX is not supported, add an error message just in case.

Decklink: revert unncessary change to cmake macros.

Decklink: fix documentation to reflect the new texture transfer method in the Decklink module.

Merge branch 'master' into temp_pie_max_items_fix

Merge branch 'master' into asset-engine

Set up and use utility functions/structs for widget property handling

Adds widget_library_utils.c and widget_library_intern.h. Behavior shouldn't be affected.

Don't add new pie level for single item

Correct RNA warning

correct comment