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/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6da444bc88e..bbe85c5f378 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -9276,7 +9276,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Tex *tex;
Scene *sce;
ToolSettings *ts;
- int i;
+ int i, a;
for(ob = main->object.first; ob; ob = ob->id.next) {
@@ -9351,15 +9351,26 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
/* texture filter */
- for(tex = main->tex.first; tex; tex = tex->id.next)
+ for(tex = main->tex.first; tex; tex = tex->id.next) {
if(tex->afmax == 0)
tex->afmax= 8;
+ }
for(ma = main->mat.first; ma; ma = ma->id.next) {
if(ma->mode & MA_HALO) {
ma->material_type= MA_TYPE_HALO;
ma->mode &= ~MA_HALO;
}
+
+ /* set new bump for unused slots */
+ for(a=0; a<MAX_MTEX; a++) {
+ if(ma->mtex[a]) {
+ if(!ma->mtex[a]->tex)
+ ma->mtex[a]->texflag |= MTEX_NEW_BUMP;
+ else if(((Tex*)newlibadr(fd, ma->id.lib, ma->mtex[a]->tex))->type == 0)
+ ma->mtex[a]->texflag |= MTEX_NEW_BUMP;
+ }
+ }
}
for(sce = main->scene.first; sce; sce = sce->id.next) {