Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes

Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];

The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42

Conflicts:
	intern/cycles/SConscript
	intern/cycles/blender/addon/__init__.py
	intern/cycles/blender/addon/properties.py
	intern/cycles/blender/blender_camera.cpp
	intern/cycles/kernel/kernel_types.h
	intern/cycles/kernel/svm/svm.h
	intern/cycles/kernel/svm/svm_types.h
	intern/cycles/render/camera.cpp
	intern/cycles/render/camera.h

1 files changed, 1 insertions, 1 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
index 517b07f5c7f..041bb60b507 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
@@ -63,7 +63,7 @@ static char GetDirectionalViewMapDensityF1D___doc__[] =
 "\n"
 "   Returns the density evaluated for an Interface1D in of the steerable\n"
 "   viewmaps image.  The direction telling which Directional map to choose\n"
-"   is explicitely specified by the user.  The density is evaluated for a\n"
+"   is explicitly specified by the user.  The density is evaluated for a\n"
 "   set of points along the Interface1D (using the\n"
 "   :class:`freestyle.functions.ReadSteerableViewMapPixelF0D` functor) and\n"
 "   then integrated into a single value using a user-defined integration\n"