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:
authorCampbell Barton <ideasman42@gmail.com>2011-10-06 10:16:20 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-06 10:16:20 +0400
commit0d2b936d622710a1bef2c0253da7c5d08ad067a7 (patch)
tree1fe3aae438cd14665bdc5706ae43e20a263867bc
parent226d3a87d28ad4327ace3dd2b6602b904fda5449 (diff)
fix [#28113] ZTransp flag is not imported correctly from 2.49 files
infact this only changes a setting which is ignored. but may as well keep whats set in 2.4x.
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 765fe7ada12..95bf44d884c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10384,7 +10384,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
ma->mode |= MA_TRANSP;
}
else {
- ma->mode |= MA_ZTRANSP;
+ /* ma->mode |= MA_ZTRANSP; */ /* leave ztransp as is even if its not used [#28113] */
ma->mode &= ~MA_TRANSP;
}
@@ -11755,7 +11755,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if(!mat->mtex[tex_nr]) continue;
if(mat->mtex[tex_nr]->mapto & MAP_ALPHA) transp_tex= 1;
}
-
+
+ /* weak! material alpha could be animated */
if(mat->alpha < 1.0f || mat->fresnel_tra > 0.0f || transp_tex){
mat->mode |= MA_TRANSP;
mat->mode &= ~(MA_ZTRANSP|MA_RAYTRANSP);