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/blender/yafray/intern | |
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/blender/yafray/intern')
-rw-r--r-- | source/blender/yafray/intern/export_File.cpp | 6 | ||||
-rw-r--r-- | source/blender/yafray/intern/export_Plugin.cpp | 6 | ||||
-rw-r--r-- | source/blender/yafray/intern/yafray_Render.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp index 7ea83f9fda4..25d30027ee8 100644 --- a/source/blender/yafray/intern/export_File.cpp +++ b/source/blender/yafray/intern/export_File.cpp @@ -244,7 +244,7 @@ bool yafrayFileRender_t::writeRender() << "\" clamp_rgb=\"" << ((re->r.YF_clamprgb==0) ? "on" : "off") << "\"\n"; } - World *world = G.scene->world; + World *world = re->scene->world; if (world) ostr << "\tbackground_name=\"world_background\"\n"; // alpha channel render when RGBA button enabled @@ -1855,7 +1855,7 @@ void yafrayFileRender_t::writeCamera() void yafrayFileRender_t::writeHemilight() { - World *world = G.scene->world; + World *world = re->scene->world; bool fromAO = false; if (re->r.GIquality==6){ // use Blender AO params is possible @@ -1961,7 +1961,7 @@ void yafrayFileRender_t::writePathlight() bool yafrayFileRender_t::writeWorld() { - World *world = G.scene->world; + World *world = re->scene->world; if (re->r.GIquality!=0) { if (re->r.GImethod==1) { if (world==NULL) cout << "WARNING: need world background for skydome!\n"; diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp index 39514ce259a..1de6920182a 100644 --- a/source/blender/yafray/intern/export_Plugin.cpp +++ b/source/blender/yafray/intern/export_Plugin.cpp @@ -241,7 +241,7 @@ bool yafrayPluginRender_t::writeRender() params["border_ymax"] = yafray::parameter_t(2.f*re->r.border.ymax - 1.f); } if (hasworld) { - World *world = G.scene->world; + World *world = re->scene->world; if (world->mode & WO_MIST) { // basic fog float fd = world->mistdist; @@ -1740,7 +1740,7 @@ void yafrayPluginRender_t::writeCamera() void yafrayPluginRender_t::writeHemilight() { yafray::paramMap_t params; - World *world = G.scene->world; + World *world = re->scene->world; bool fromAO = false; if (re->r.GIquality==6){ // use Blender AO params is possible @@ -1864,7 +1864,7 @@ void yafrayPluginRender_t::writePathlight() bool yafrayPluginRender_t::writeWorld() { - World *world = G.scene->world; + World *world = re->scene->world; if (re->r.GIquality!=0) { if (re->r.GImethod==1) { if (world==NULL) cout << "WARNING: need world background for skydome!\n"; diff --git a/source/blender/yafray/intern/yafray_Render.cpp b/source/blender/yafray/intern/yafray_Render.cpp index 01da4683d71..d0006786507 100644 --- a/source/blender/yafray/intern/yafray_Render.cpp +++ b/source/blender/yafray/intern/yafray_Render.cpp @@ -29,7 +29,7 @@ bool yafrayRender_t::exportScene(Render* re) this->re = re; // get camera first, no checking should be necessary, all done by Blender - maincam_obj = G.scene->camera; + maincam_obj = re->scene->camera; // use fixed lens for objects functioning as temporary camera (ctrl-0) mainCamLens = 35.0; |