[Bf-blender-cvs] [aa4102a441c] blender2.8: Merge branch 'master' into blender2.8

[Sybren A. Stüvel]

Commit: aa4102a441c00dfa321c9627bb8c04c4b350f115
Author: Sybren A. Stüvel
Date:   Thu Apr 20 12:50:20 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBaa4102a441c00dfa321c9627bb8c04c4b350f115

Merge branch 'master' into blender2.8

Disabled a unittest, to be re-enabled when T51261 is fixed.

# Conflicts:
#	source/blender/alembic/intern/alembic_capi.cc

===================================================================



===================================================================

diff --cc tests/python/bl_alembic_import_test.py
index c27a7f23acf,cd23183ec06..5f7b4440e5f
--- a/tests/python/bl_alembic_import_test.py
+++ b/tests/python/bl_alembic_import_test.py
@@@ -63,6 -63,28 +63,30 @@@ class SimpleImportTest(unittest.TestCas
          self.assertEqual(objects['Cube_003'], objects['Cube_005'].parent)
          self.assertEqual(objects['Cube_003'], objects['Cube_006'].parent)
  
 -    def test_select_after_import(self):
++    def DISABLED_test_select_after_import(self):
++        self.fail('FIXME: Disabled until https://developer.blender.org/T51261 is fixed')
++
+         # Add a sphere, so that there is something in the scene, selected, and active,
+         # before we do the Alembic import.
+         bpy.ops.mesh.primitive_uv_sphere_add()
+         sphere = bpy.context.active_object
+         self.assertEqual('Sphere', sphere.name)
+         self.assertEqual([sphere], bpy.context.selected_objects)
+ 
+         bpy.ops.wm.alembic_import(
+             filepath=str(self.testdir / "cubes-hierarchy.abc"),
+             as_background_job=False)
+ 
+         # The active object is probably the first one that was imported, but this
+         # behaviour is not defined. At least it should be one of the cubes, and
+         # not the sphere.
+         self.assertNotEqual(sphere, bpy.context.active_object)
+         self.assertTrue('Cube' in bpy.context.active_object.name)
+ 
+         # All cubes should be selected, but the sphere shouldn't be.
+         for ob in bpy.data.objects:
 -            self.assertEqual('Cube' in ob.name, ob.select)
++            self.assertEqual('Cube' in ob.name, ob.select_get())
+ 
  
  def main():
      global args