[Bf-blender-cvs] [90b2fceca2f] master: Cleanup: remove last bits of WITH_LEGACY_DEPSGRAPH CMake option.

Bastien Montagne noreply at git.blender.org
Thu Apr 18 11:35:48 CEST 2019


Commit: 90b2fceca2f5116b0a8c3ef2a1a0ebec42dd3f57
Author: Bastien Montagne
Date:   Thu Apr 18 11:34:53 2019 +0200
Branches: master
https://developer.blender.org/rB90b2fceca2f5116b0a8c3ef2a1a0ebec42dd3f57

Cleanup: remove last bits of WITH_LEGACY_DEPSGRAPH CMake option.

Legacy depsgraph has been removed from Blender since several months
already...

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

M	CMakeLists.txt
M	tests/python/CMakeLists.txt
M	tests/python/bl_alembic_import_test.py

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ab5655bff4..052222b36b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -544,10 +544,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
   endif()
 endif()
 
-# Dependency graph
-option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON)
-mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
-
 if(WIN32)
   # Use hardcoded paths or find_package to find externals
   option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index fdd2efb69d1..2d9fe8c4f37 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -624,7 +624,6 @@ if(WITH_ALEMBIC)
     --python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
     --
     --testdir "${TEST_SRC_DIR}/alembic"
-    --with-legacy-depsgraph=${WITH_LEGACY_DEPSGRAPH}
   )
 endif()
 
diff --git a/tests/python/bl_alembic_import_test.py b/tests/python/bl_alembic_import_test.py
index fe69f200c76..2cde6d57a7f 100644
--- a/tests/python/bl_alembic_import_test.py
+++ b/tests/python/bl_alembic_import_test.py
@@ -165,9 +165,6 @@ class SimpleImportTest(AbstractAlembicTest):
         bpy.data.cache_files[fname].filepath = relpath.replace('1.abc', '2.abc')
         bpy.context.scene.update()
 
-        if args.with_legacy_depsgraph:
-            bpy.context.scene.frame_set(10)
-
         cube = bpy.context.depsgraph.id_eval_get(cube)
         x, y, z = cube.matrix_world.to_euler('XYZ')
         self.assertAlmostEqual(x, math.pi / 2, places=5)
@@ -254,8 +251,6 @@ def main():
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--testdir', required=True, type=pathlib.Path)
-    parser.add_argument('--with-legacy-depsgraph', default=False,
-                        type=lambda v: v in {'ON', 'YES', 'TRUE'})
     args, remaining = parser.parse_known_args(argv)
 
     unittest.main(argv=remaining)



More information about the Bf-blender-cvs mailing list