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, 4 insertions, 3 deletions

diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py
index f5455ce5018..d3d9255123b 100644
--- a/release/scripts/modules/bpy/ops.py
+++ b/release/scripts/modules/bpy/ops.py
@@ -30,12 +30,13 @@ op_get_rna = ops_module.get_rna
 op_get_instance = ops_module.get_instance
 
 
-class BPyOps(object):
+class BPyOps:
     """
     Fake module like class.
 
      bpy.ops
     """
+    __slots__ = ()
 
     def __getattr__(self, module):
         """
@@ -68,7 +69,7 @@ class BPyOps(object):
         return "<module like class 'bpy.ops'>"
 
 
-class BPyOpsSubMod(object):
+class BPyOpsSubMod:
     """
     Utility class to fake submodules.
 
@@ -104,7 +105,7 @@ class BPyOpsSubMod(object):
         return "<module like class 'bpy.ops.%s'>" % self._module
 
 
-class BPyOpsSubModOp(object):
+class BPyOpsSubModOp:
     """
     Utility class to fake submodule operators.