diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-04-09 22:22:05 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-04-09 22:22:05 +0400 |
| commit | cbb48709ebb55c6cc5068d04158817f07d9153d9 (patch) | |
| tree | f583974cbce18931810c0927940d8d71ef6cf573 | |
| parent | de3a62209511bbd638f78853d34d409f1a792313 (diff) | |
Bugfix #3906
Restored animated background picture, using a bad call actually, but thats
clearly noted in comments in code. Is remainder work for cleaning up the
whole render api. :)
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 1 | ||||
| -rw-r--r-- | source/blender/src/buttons_shading.c | 2 | ||||
| -rw-r--r-- | source/blender/src/drawview.c | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 8f5c0d5cecb..5c8cac8f71c 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -132,6 +132,7 @@ int calcimanr(int cfra, Tex *tex) return imanr; } +/* note; this function is called in src/drawview.c for animated background image, option should move to kernel */ void init_render_texture(Render *re, Tex *tex) { Image *ima; diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index ed744978900..344d72587b2 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -2830,7 +2830,7 @@ static void material_panel_tramir(Material *ma) uiBlockBeginAlign(block); uiDefButBitI(block, TOG, MA_NOMIST, 0, "No Mist", 10,10,150,20, &(ma->mode), 0, 0, 0, 0, "Sets the material to ignore mist values"); - uiDefButBitI(block, TOG, MA_ENV, 0, "Env", 160,10,150,20, &(ma->mode), 0, 0, 0, 0, "Causes faces to render with alpha zero: allows sky/backdrop to show through"); + uiDefButBitI(block, TOG, MA_ENV, 0, "Env", 160,10,150,20, &(ma->mode), 0, 0, 0, 0, "Causes faces to render with alpha zero: allows sky/backdrop to show through (only for solid faces)"); uiBlockEndAlign(block); diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index ac97acbd87d..6bab751977b 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -125,6 +125,8 @@ #include "BPY_extern.h" +#include "RE_render_ext.h" + #include "blendef.h" #include "mydevice.h" #include "butspace.h" // event codes @@ -339,7 +341,9 @@ static void draw_bgpic(void) if(bgpic==0) return; if(bgpic->tex) { -// init_render_texture(bgpic->tex); + extern void init_render_texture(struct Render *re, Tex *tex); + /* note; bad call, this has to be recoded to move to blenkernel */ + init_render_texture(NULL, bgpic->tex); free_unused_animimages(); ima= bgpic->tex->ima; } |