[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19930] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fixed shrinkwrap bug:

[André Pinto]

Revision: 19930
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19930
Author:   jaguarandi
Date:     2009-04-26 15:26:18 +0200 (Sun, 26 Apr 2009)

Log Message:
-----------
Fixed shrinkwrap bug:
	shrinkwrap wasn't using the updated coordinates/normals of vertexs
	when the DerivedMesh had been modified by a previous modifier.

	before revision 19744, users would only notice a strange behaviour
	of shrinkwrap in projection mode (because it was using the wrong normals)
	(jpbouza reported this)

	after revision 19744 this bug was "bigger".

Anyway it's fixed now :)

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19744
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19744

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

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2009-04-26 12:23:30 UTC (rev 19929)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2009-04-26 13:26:18 UTC (rev 19930)
@@ -7915,7 +7915,7 @@
 		else if(ob->type==OB_LATTICE) dm = NULL;
 		else return;
 
-		if(dm != NULL && (dataMask & CD_MVERT))
+		if(dm != NULL && (dataMask & (1<<CD_MVERT)))
 		{
 			CDDM_apply_vert_coords(dm, vertexCos);
 			CDDM_calc_normals(dm);
@@ -7940,7 +7940,7 @@
 		else if(ob->type==OB_LATTICE) dm = NULL;
 		else return;
 
-		if(dm != NULL && (dataMask & CD_MVERT))
+		if(dm != NULL && (dataMask & (1<<CD_MVERT)))
 		{
 			CDDM_apply_vert_coords(dm, vertexCos);
 			CDDM_calc_normals(dm);