Blender Git Loki

Merge branch 'depsgraph_refactor' into depsgraph_refactor_cpp

Merge branch 'master' into depsgraph_refactor

Conflicts:
source/blender/makesrna/intern/rna_scene.c

merge with trunk

Fix accumulated painting in 2d painting, and refactor float code to use
correct blending too.

Fix accumulated brushes. Those would never completely fill canvas
because mask factor of brush never reached 1.0 due to it being
calculated by geometric series with factor less than one. Now simply add
new mask to the accumulated mask.

Note - it may be preferable to handle airbrushes like that too, since
they suffer from the same issue.

2D case will be handled separately, things look unnecessarily complex
here already, and I have totally forgotten to handle correct masking in
float case.

get_operation function in component nodes now takes the same extra
arguments as the add_operation function in Depsgraph.

Renamed create_*_node functions to get_*_node, following same naming
scheme as depgraph uses for generic node creation methods.

Conflicts:
source/blender/depsgraph/intern/depsgraph.cpp
source/blender/depsgraph/intern/depsgraph.h
source/blender/depsgraph/intern/depsnode.cpp
source/blender/depsgraph/intern/depsnode.h
source/blender/depsgraph/intern/depsnode_component.cpp
source/blender/depsgraph/intern/depsnode_component.h

Properly register components and operations in the hash maps.

Complementary remove/clear functions for the component/operations
hierarchy nodes.

Conflicts:
source/blender/depsgraph/intern/depsgraph.h
source/blender/depsgraph/intern/depsnode_component.h

Added new functions for directly creating components and operations in
their respective owner nodes.

This will be used instead of creating them via graph functions, which
need to do ugly global lookups.

Conflicts:
source/blender/depsgraph/intern/depsnode_component.cpp
source/blender/depsgraph/intern/depsnode_component.h

Cleanup: Use std::string instead of char arrays/pointers.

A utility function string_format has been added util_string to implement
sprintf-like functionality and avoid using the moronic stringstream crap.

Replaced the generic owner in DepsNode by specialized owner pointers in
ComponentDepsNode and OperationDepsNode. This may get removed entirely
later on, but for now avoids potential casting errors.

TimeSourceDepsNode does not have an owner now, but it's largely
unfinished anyway.

Changed use of the unordered_map build test to allow using the actual
namespace elements and put hash specializations in it.

This follows the example set by ceres.

Utility header for std::string.

Avoids repetitive "using std::string" and allows adding possible helpers
later.

Made find_node_criteria_from_pointer a static internal function in
depsgraph.c.

This will be replaced eventually.

Bring back lazy initialization with less time spent locking. It looks
like cause was compile time reordering, nice volatile declarations
solved the issue :). Nice speedup too!

Fix deadlock from last commit.

This worked fine on debug builds but not on release. Lazy initialization
is forfeit for now until I can figure this out but we do not look for
old tiles anymore, so waiting should be somewhat shorter.

Projective painting optimization:

* Lazy tile publishing scheme so threads now do not wait for tile to be
initialized.

* Do not search for old tiles in projective painting when pushing since
we already know there is no existing one and we need them.

Use common operator for painting a curved stroke.

This allows to use one keymap for all paintcurve systems. Also has the
advantage that it can be added to stroke panel for nice UI access.

Also fixes weight/vertex painting not working because of transform
operator override

Merge branch 'master' into soc-2013-paint

Also includes follow up to fix for T39412

Conflicts:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/makesrna/intern/rna_brush.c