diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-04 17:14:06 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-04 17:14:06 +0300 |
commit | f7cb86df3a9ceccc4d649e42735732a608169157 (patch) | |
tree | 558a9ba43708a2213b1afa8f46d79f5daa140bc6 /source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | |
parent | 74f9e98c828c17910405092785633373d4ae88e8 (diff) |
2.5
Think global, act local!
The old favorite G.scene gone! Man... that took almost 2 days.
Also removed G.curscreen and G.edbo.
Not everything could get solved; here's some notes.
- modifiers now store current scene in ModifierData. This is not
meant for permanent, but it can probably stick there until we
cleaned the anim system and depsgraph to cope better with
timing issues.
- Game engine G.scene should become an argument for staring it.
Didn't solve this yet.
- Texture nodes should get scene cfra, but the current implementation
is too tightly wrapped to do it easily.
Diffstat (limited to 'source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp')
-rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 01eedc68964..d5eaeb34f1b 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -117,7 +117,7 @@ extern "C" void StartKetsjiShell(struct ScrArea *area, int always_use_expand_framing) { int exitrequested = KX_EXIT_REQUEST_NO_REQUEST; - + Scene *scene= NULL; // XXX give as arg Main* blenderdata = maggie1; char* startscenename = scenename; @@ -207,12 +207,12 @@ extern "C" void StartKetsjiShell(struct ScrArea *area, //lock frame and camera enabled - storing global values - int tmp_lay= G.scene->lay; - Object *tmp_camera = G.scene->camera; + int tmp_lay= scene->lay; + Object *tmp_camera = scene->camera; if (v3d->scenelock==0){ - G.scene->lay= v3d->lay; - G.scene->camera= v3d->camera; + scene->lay= v3d->lay; + scene->camera= v3d->camera; } @@ -478,8 +478,8 @@ extern "C" void StartKetsjiShell(struct ScrArea *area, } //lock frame and camera enabled - restoring global values if (v3d->scenelock==0){ - G.scene->lay= tmp_lay; - G.scene->camera= tmp_camera; + scene->lay= tmp_lay; + scene->camera= tmp_camera; } // set the cursor back to normal |