Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
	source/blender/blenlib/BLI_ghash.h
	source/blender/blenlib/intern/BLI_ghash.c
	source/blender/blenlib/intern/hash_mm2a.c
	source/blender/bmesh/tools/bmesh_region_match.c
	tests/gtests/blenlib/BLI_ghash_performance_test.cc
	tests/gtests/blenlib/BLI_ghash_test.cc
	tests/gtests/blenlib/CMakeLists.txt

3 files changed, 51 insertions, 19 deletions

diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py
index 81de0d7c6f0..65ccc3f8dc3 100644
--- a/release/scripts/modules/bpy_extras/io_utils.py
+++ b/release/scripts/modules/bpy_extras/io_utils.py
@@ -21,7 +21,7 @@
 __all__ = (
     "ExportHelper",
     "ImportHelper",
-    "OrientationHelper",
+    "orientation_helper_factory",
     "axis_conversion",
     "axis_conversion_ensure",
     "create_derived_objects",
@@ -35,7 +35,11 @@ __all__ = (
     )
 
 import bpy
-from bpy.props import StringProperty, BoolProperty, EnumProperty
+from bpy.props import (
+        StringProperty,
+        BoolProperty,
+        EnumProperty,
+        )
 
 
 def _check_axis_conversion(op):
@@ -61,6 +65,12 @@ class ExportHelper:
             options={'HIDDEN'},
             )
 
+    # needed for mix-ins
+    order = [
+        "filepath",
+        "check_existing",
+        ]
+
     # subclasses can override with decorator
     # True == use ext, False == no ext, None == do nothing.
     check_extension = True
@@ -109,6 +119,11 @@ class ImportHelper:
             subtype='FILE_PATH',
             )
 
+    # needed for mix-ins
+    order = [
+        "filepath",
+        ]
+
     def invoke(self, context, event):
         context.window_manager.fileselect_add(self)
         return {'RUNNING_MODAL'}
@@ -117,13 +132,14 @@ class ImportHelper:
         return _check_axis_conversion(self)
 
 
-class OrientationHelper:
+def orientation_helper_factory(name, axis_forward='Y', axis_up='Z'):
+    members = {}
 
     def _update_axis_forward(self, context):
         if self.axis_forward[-1] == self.axis_up[-1]:
             self.axis_up = self.axis_up[0:-1] + 'XYZ'[('XYZ'.index(self.axis_up[-1]) + 1) % 3]
 
-    axis_forward = EnumProperty(
+    members['axis_forward'] = EnumProperty(
             name="Forward",
             items=(('X', "X Forward", ""),
                    ('Y', "Y Forward", ""),
@@ -132,7 +148,7 @@ class OrientationHelper:
                    ('-Y', "-Y Forward", ""),
                    ('-Z', "-Z Forward", ""),
                    ),
-            default='-Z',
+            default=axis_forward,
             update=_update_axis_forward,
             )
 
@@ -140,7 +156,7 @@ class OrientationHelper:
         if self.axis_up[-1] == self.axis_forward[-1]:
             self.axis_forward = self.axis_forward[0:-1] + 'XYZ'[('XYZ'.index(self.axis_forward[-1]) + 1) % 3]
 
-    axis_up = EnumProperty(
+    members['axis_up'] = EnumProperty(
             name="Up",
             items=(('X', "X Up", ""),
                    ('Y', "Y Up", ""),
@@ -149,10 +165,17 @@ class OrientationHelper:
                    ('-Y', "-Y Up", ""),
                    ('-Z', "-Z Up", ""),
                    ),
-            default='Y',
+            default=axis_up,
             update=_update_axis_up,
             )
 
+    members["order"] = [
+        "axis_forward",
+        "axis_up",
+        ]
+
+    return type(name, (object,), members)
+
 
 # Axis conversion function, not pretty LUT
 # use lookup table to convert between any axis
@@ -349,7 +372,7 @@ def unpack_list(list_of_tuples):
 
 # same as above except that it adds 0 for triangle faces
 def unpack_face_list(list_of_tuples):
-    #allocate the entire list
+    # allocate the entire list
     flat_ls = [0] * (len(list_of_tuples) * 4)
     i = 0
 
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index 13ef86b23c0..78fb6aa8fa2 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -31,7 +31,10 @@ __all__ = (
 
 import bpy
 
-from bpy.props import BoolProperty, FloatVectorProperty
+from bpy.props import (
+        BoolProperty,
+        FloatVectorProperty,
+        )
 
 
 def add_object_align_init(context, operator):
@@ -171,7 +174,7 @@ def object_data_add(context, obdata, operator=None, use_active_layer=True, name=
 
         obj_act.select = True
         scene.update()  # apply location
-        #scene.objects.active = obj_new
+        # scene.objects.active = obj_new
 
         bpy.ops.object.join()  # join into the active.
         if obdata:
@@ -287,7 +290,8 @@ def world_to_camera_view(scene, obj, coord):
     Returns the camera space coords for a 3d point.
     (also known as: normalized device coordinates - NDC).
 
-    Where (0, 0) is the bottom left and (1, 1) is the top right of the camera frame.
+    Where (0, 0) is the bottom left and (1, 1)
+    is the top right of the camera frame.
     values outside 0-1 are also supported.
     A negative 'z' value means the point is behind the camera.
 
@@ -300,7 +304,8 @@ def world_to_camera_view(scene, obj, coord):
     :type obj: :class:`bpy.types.Object`
     :arg coord: World space location.
     :type coord: :class:`mathutils.Vector`
-    :return: a vector where X and Y map to the view plane and Z is the depth on the view axis.
+    :return: a vector where X and Y map to the view plane and
+       Z is the depth on the view axis.
     :rtype: :class:`mathutils.Vector`
     """
     from mathutils import Vector
diff --git a/release/scripts/modules/bpy_extras/view3d_utils.py b/release/scripts/modules/bpy_extras/view3d_utils.py
index ec4a395f1e1..4aa06262970 100644
--- a/release/scripts/modules/bpy_extras/view3d_utils.py
+++ b/release/scripts/modules/bpy_extras/view3d_utils.py
@@ -69,11 +69,13 @@ def region_2d_to_origin_3d(region, rv3d, coord, clamp=None):
 
     .. note::
 
-       Orthographic views have a less obvious origin, the far clip is used to define the viewport near/far extents.
-       Since far clip can be a very large value, the result may give with numeric precision issues.
+       Orthographic views have a less obvious origin,
+       the far clip is used to define the viewport near/far extents.
+       Since far clip can be a very large value,
+       the result may give with numeric precision issues.
 
-       To avoid this problem, you can optionally clamp the far clip to a smaller value
-       based on the data you're operating on.
+       To avoid this problem, you can optionally clamp the far clip to a
+       smaller value based on the data you're operating on.
 
     :arg region: region of the 3D viewport, typically bpy.context.region.
     :type region: :class:`bpy.types.Region`
@@ -160,7 +162,7 @@ def region_2d_to_location_3d(region, rv3d, coord, depth_location):
                                     )[0]
 
 
-def location_3d_to_region_2d(region, rv3d, coord):
+def location_3d_to_region_2d(region, rv3d, coord, default=None):
     """
     Return the *region* relative 2d location of a 3d position.
 
@@ -170,8 +172,10 @@ def location_3d_to_region_2d(region, rv3d, coord):
     :type rv3d: :class:`bpy.types.RegionView3D`
     :arg coord: 3d worldspace location.
     :type coord: 3d vector
+    :arg default: Return this value if ``coord``
+       is behind the origin of a perspective view.
     :return: 2d location
-    :rtype: :class:`mathutils.Vector`
+    :rtype: :class:`mathutils.Vector` or ``default`` argument.
     """
     from mathutils import Vector
 
@@ -184,4 +188,4 @@ def location_3d_to_region_2d(region, rv3d, coord):
                        height_half + height_half * (prj.y / prj.w),
                        ))
     else:
-        return None
+        return default