Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
-rw-r--r--source/blender/blenkernel/intern/texture.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 9300b39a767..cdbd2afb421 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -812,14 +812,14 @@ Tex *give_current_texture(Object *ob, int act)
return tex;
}
-Tex *give_current_world_texture(void)
+Tex *give_current_world_texture(Scene *scene)
{
MTex *mtex = 0;
Tex *tex = 0;
- if(!(G.scene->world)) return 0;
+ if(!(scene->world)) return 0;
- mtex= G.scene->world->mtex[(int)(G.scene->world->texact)];
+ mtex= scene->world->mtex[(int)(scene->world->texact)];
if(mtex) tex= mtex->tex;
return tex;