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

[Sybren A. Stüvel]

Commit: 81011679ddb1fc57e37fe1ba2eb494a1dedaa0fd
Author: Sybren A. Stüvel
Date:   Fri Apr 21 14:19:05 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB81011679ddb1fc57e37fe1ba2eb494a1dedaa0fd

Merge branch 'master' into blender2.8

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



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

diff --cc tests/python/bl_alembic_import_test.py
index 5f7b4440e5f,33ccc49f301..7c0f0254973
--- a/tests/python/bl_alembic_import_test.py
+++ b/tests/python/bl_alembic_import_test.py
@@@ -85,8 -83,45 +85,45 @@@ class SimpleImportTest(unittest.TestCas
  
          # 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 test_change_path(self):
+         import math
+ 
+         fname = 'cube-rotating1.abc'
+         abc = self.testdir / fname
+         relpath = bpy.path.relpath(str(abc))
+ 
+         res = bpy.ops.wm.alembic_import(filepath=str(abc), as_background_job=False)
+         self.assertEqual({'FINISHED'}, res)
+         cube = bpy.context.active_object
+ 
+         # Check that the file loaded ok.
+         bpy.context.scene.frame_set(10)
+         x, y, z = cube.matrix_world.to_euler('XYZ')
+         self.assertAlmostEqual(x, 0)
+         self.assertAlmostEqual(y, 0)
+         self.assertAlmostEqual(z, math.pi / 2, places=5)
+ 
+         # Change path from absolute to relative. This should not break the animation.
+         bpy.context.scene.frame_set(1)
+         bpy.data.cache_files[fname].filepath = relpath
+         bpy.context.scene.frame_set(10)
+ 
+         x, y, z = cube.matrix_world.to_euler('XYZ')
+         self.assertAlmostEqual(x, 0)
+         self.assertAlmostEqual(y, 0)
+         self.assertAlmostEqual(z, math.pi / 2, places=5)
+ 
+         # Replace the Alembic file; this should apply new animation.
+         bpy.data.cache_files[fname].filepath = relpath.replace('1.abc', '2.abc')
+         bpy.context.scene.update()
+ 
+         x, y, z = cube.matrix_world.to_euler('XYZ')
+         self.assertAlmostEqual(x, math.pi / 2, places=5)
+         self.assertAlmostEqual(y, 0)
+         self.assertAlmostEqual(z, 0)
+ 
  
  def main():
      global args