From dc6bc313cdd5be6ca10a2ec5048b77d81fc9acf5 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Wed, 19 Dec 2012 17:04:14 -0500
Subject: [PATCH] changed gfx __init__.py to push scene and scene.Stereo to
main and ost namespaces
---
modules/gfx/pymod/__init__.py | 8 ++++++++
modules/gui/pymod/dng/init.py | 2 --
scripts/ost_startup.py | 9 ---------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/modules/gfx/pymod/__init__.py b/modules/gfx/pymod/__init__.py
index eb3c91a16..ec7f8e798 100644
--- a/modules/gfx/pymod/__init__.py
+++ b/modules/gfx/pymod/__init__.py
@@ -386,3 +386,11 @@ def _scene_export(self,*args,**kwargs):
""")
SceneSingleton.Export=_scene_export
+
+import __main__ as main_mod
+main_mod.scene=Scene()
+main_mod.scene.Stereo=Stereo
+
+import ost as ost_mod
+ost_mod.scene=Scene()
+ost_mod.scene.Stereo=Stereo
diff --git a/modules/gui/pymod/dng/init.py b/modules/gui/pymod/dng/init.py
index ef122cd97..e2338deed 100644
--- a/modules/gui/pymod/dng/init.py
+++ b/modules/gui/pymod/dng/init.py
@@ -12,8 +12,6 @@ try:
except ImportError:
_img_present=False
pass
-ost.scene = gfx.Scene()
-ost.scene.Stereo=gfx.Stereo
import httplib
diff --git a/scripts/ost_startup.py b/scripts/ost_startup.py
index 1287ec1fb..92e210ff6 100644
--- a/scripts/ost_startup.py
+++ b/scripts/ost_startup.py
@@ -35,15 +35,6 @@ else:
from ost import *
import ost
-try:
- from ost import gfx
- ost.scene = gfx.Scene()
- scene=gfx.Scene()
- ost.scene.Stereo=gfx.Stereo
- scene.Stereo=gfx.Stereo
-except ImportError:
- print "ost build without gfx"
- pass
ost.SetPrefixPath(_base_dir)
def _InitRuleBasedBuilder():
--
GitLab