[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25383] trunk/blender/source/blender/ blenkernel/intern/multires.c: Fix #20362: multires conversion from 2. 5alpha0 not working.

[Brecht Van Lommel]

Revision: 25383
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25383
Author:   blendix
Date:     2009-12-14 21:47:02 +0100 (Mon, 14 Dec 2009)

Log Message:
-----------
Fix #20362: multires conversion from 2.5alpha0 not working. It's still not
entirely the same, the tangets are a bit different at face edges/corners.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/multires.c

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2009-12-14 20:37:05 UTC (rev 25382)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2009-12-14 20:47:02 UTC (rev 25383)
@@ -784,6 +784,11 @@
 			for(x = 0; x < newside; ++x, ++out) {
 				old_mdisps_rotate(S, newside, oldside, x, y, &u, &v);
 				old_mdisps_bilinear(*out, mdisp->disps, oldside, u, v);
+
+				if(S == 1) { (*out)[1]= -(*out)[1]; }
+				else if(S == 2) { SWAP(float, (*out)[0], (*out)[1]); }
+				else if(S == 3) { (*out)[0]= -(*out)[0]; }
+				else if(S == 0) { SWAP(float, (*out)[0], (*out)[1]); (*out)[0]= -(*out)[0]; (*out)[1]= -(*out)[1]; };
 			}
 		}
 	}