[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53209] trunk/blender/source/blender/imbuf /intern/dds/FlipDXT.cpp: Fix #33629: DDS DXT5 with alpha not loaded correctly, Y flipping code was wrong.

[Brecht Van Lommel]

Revision: 53209
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53209
Author:   blendix
Date:     2012-12-20 15:45:42 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Fix #33629: DDS DXT5 with alpha not loaded correctly, Y flipping code was wrong.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp

Modified: trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp   2012-12-20 
14:45:56 UTC (rev 53208)
+++ trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.cpp   2012-12-20 
15:45:42 UTC (rev 53209)
@@ -147,10 +147,10 @@
 
        block[2] = line_3_2 & 0xff;
        block[3] = (line_3_2 & 0xff00) >> 8;
-       block[4] = (line_3_2 & 0xff0000) >> 8;
+       block[4] = (line_3_2 & 0xff0000) >> 16;
        block[5] = line_1_0 & 0xff;
        block[6] = (line_1_0 & 0xff00) >> 8;
-       block[7] = (line_1_0 & 0xff0000) >> 8;
+       block[7] = (line_1_0 & 0xff0000) >> 16;
 
        // And flip the DXT1 block using the above function.
        FlipDXT1BlockFull(block + 8);
@@ -165,7 +165,7 @@
                                ((line_0_1 & 0xfff000) >> 12);
        block[2] = line_1_0 & 0xff;
        block[3] = (line_1_0 & 0xff00) >> 8;
-       block[4] = (line_1_0 & 0xff0000) >> 8;
+       block[4] = (line_1_0 & 0xff0000) >> 16;
        FlipDXT1BlockHalf(block + 8);
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs