[Bf-blender-cvs] [a88a4fecaec] temp-benchmark: Benchmark: populate benchmark space from submodule.

Brecht Van Lommel noreply at git.blender.org
Thu Aug 2 19:40:10 CEST 2018


Commit: a88a4fecaecefaa5f198c73d0b330681f12ee209
Author: Brecht Van Lommel
Date:   Fri Jul 20 12:38:51 2018 +0200
Branches: temp-benchmark
https://developer.blender.org/rBa88a4fecaecefaa5f198c73d0b330681f12ee209

Benchmark: populate benchmark space from submodule.

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

M	.gitmodules
A	release/scripts/benchmark
M	release/scripts/startup/bl_ui/space_benchmark.py

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

diff --git a/.gitmodules b/.gitmodules
index 02875320630..e21d1e3b5fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,3 +18,6 @@
 	url = ../blender-dev-tools.git
 	branch = master
 	ignore = all
+[submodule "release/scripts/benchmark"]
+	path = release/scripts/benchmark
+	url = ../blender-benchmark-bundle.git
diff --git a/release/scripts/benchmark b/release/scripts/benchmark
new file mode 160000
index 00000000000..899d7f315e5
--- /dev/null
+++ b/release/scripts/benchmark
@@ -0,0 +1 @@
+Subproject commit 899d7f315e5c1e5bad7c2ea62126f332b8021254
diff --git a/release/scripts/startup/bl_ui/space_benchmark.py b/release/scripts/startup/bl_ui/space_benchmark.py
index b8e47804e80..3155742e7d6 100644
--- a/release/scripts/startup/bl_ui/space_benchmark.py
+++ b/release/scripts/startup/bl_ui/space_benchmark.py
@@ -17,12 +17,12 @@
 # ##### END GPL LICENSE BLOCK #####
 
 # <pep8 compliant>
-import bpy
 
-classes = (
-)
+# Defer to release/scripts/benchmark to populate this space
+import bpy
+import sys
+for path in bpy.utils.script_paths('benchmark'):
+    sys.path.insert(0, path)
 
-if __name__ == "__main__":  # only for live edit.
-    from bpy.utils import register_class
-    for cls in classes:
-        register_class(cls)
+import benchmark.space
+classes = benchmark.space.classes



More information about the Bf-blender-cvs mailing list