[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42603] branches/soc-2011-onion-uv-tools/ source/blender/editors/uvedit/uvedit_unwrap_ops.c: Fix unwrap warning due to recent dscale fixes.
Antony Riakiotakis
kalast at gmail.com
Tue Dec 13 13:49:23 CET 2011
Revision: 42603
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42603
Author: psy-fi
Date: 2011-12-13 12:49:12 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Fix unwrap warning due to recent dscale fixes. Also silence compiler warning
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2011-12-13 11:58:59 UTC (rev 42602)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2011-12-13 12:49:12 UTC (rev 42603)
@@ -328,7 +328,7 @@
MFace *subsurfedFaces;
MTFace *subsurfedTexfaces;
/* number of vertices and faces for subsurfed mesh*/
- int numOfVerts, numOfEdges, numOfFaces;
+ int numOfEdges, numOfFaces;
/* holds a map to editfaces for every subsurfed MFace. These will be used to get hidden/ selected flags etc. */
EditFace **faceMap;
@@ -378,7 +378,6 @@
subsurfedTexfaces = derivedMesh->getFaceDataArray(derivedMesh, CD_MTFACE);
- numOfVerts = derivedMesh->getNumVerts(derivedMesh);
numOfEdges = derivedMesh->getNumEdges(derivedMesh);
numOfFaces = derivedMesh->getNumFaces(derivedMesh);
@@ -1205,8 +1204,8 @@
}
if((fabs(obedit->size[0] - 1.0) > UNWRAP_SCALE_EPSILON) || (fabs(obedit->size[1] - 1.0) > UNWRAP_SCALE_EPSILON) ||
- (fabs(obedit->size[2] - 1.0) > UNWRAP_SCALE_EPSILON) || (fabs(obedit->dsize[0]) > UNWRAP_SCALE_EPSILON) ||
- (fabs(obedit->dsize[1]) > UNWRAP_SCALE_EPSILON) || (fabs(obedit->dsize[2]) > UNWRAP_SCALE_EPSILON)){
+ (fabs(obedit->size[2] - 1.0) > UNWRAP_SCALE_EPSILON) || (fabs(obedit->dsize[0] - 1.0) > UNWRAP_SCALE_EPSILON) ||
+ (fabs(obedit->dsize[1] - 1.0) > UNWRAP_SCALE_EPSILON) || (fabs(obedit->dsize[2] - 1.0) > UNWRAP_SCALE_EPSILON)){
BKE_report(op->reports, RPT_WARNING, "Object scale is not 1.0. Unwrap will operate on a non-scaled version of the mesh.");
}
More information about the Bf-blender-cvs
mailing list