[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40826] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix [#28113] ZTransp flag is not imported correctly from 2.49 files

[Campbell Barton]

Revision: 40826
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40826
Author:   campbellbarton
Date:     2011-10-06 06:16:20 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-06 05:45:06 UTC (rev 40825)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-06 06:16:20 UTC (rev 40826)
@@ -10384,7 +10384,7 @@
 				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 @@
 					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);