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. :)

diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c
index 8f5c0d5cecbf486913544cce8023b98001a25c71..5c8cac8f71cf0bc826bc6de7fa46b3dbe5d48c30 100644 (file)
--- 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;
 }
 
        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;
 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 ed74497890057b8d14ee1cce7c9eb761e385e44d..344d72587b28816c3b471f7b674d0613ffa789bd 100644 (file)
--- 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");
 
        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);
 
 
        uiBlockEndAlign(block);
 
 

diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index ac97acbd87dd539100f45b85473ad8ce253feb6a..6bab751977b070f8f679dba4aa288c1b8421ace5 100644 (file)
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -125,6 +125,8 @@
 
 #include "BPY_extern.h"
 
 
 #include "BPY_extern.h"
 

+#include "RE_render_ext.h"
+

 #include "blendef.h"
 #include "mydevice.h"
 #include "butspace.h"  // event codes
 #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) {
        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;
        }
                free_unused_animimages();
                ima= bgpic->tex->ima;
        }