Revision: 37353
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37353
Author: psy-fi
Date: 2011-06-10 00:52:41 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
Made change because cast to intptr_t may introduce surprises. How could the
compiler accept this syntax is beyond me
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified:
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-06-10 00:41:53 UTC (rev 37352)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-06-10 00:52:41 UTC (rev 37353)
@@ -189,8 +189,7 @@
//smd.flags = ;
initialDerived = CDDM_from_editmesh(em, NULL);
- /* This is not very useful actually, we need to be able to
account for mirror modifiers etc.
- However it -is- useful as a proof-of-concept implementation
:) */
+
derivedMesh = subsurf_make_derived_from_derived(initialDerived,
&smd, NULL,
0, NULL, 1, 1, 0);
@@ -251,9 +250,9 @@
vkeys[2] = (ParamKey)efa->v3->tmp.l;
if(use_subsurf){
- co[0] = subsurfedVerts[indexMap[vkeys[0]]].co;
- co[1] = subsurfedVerts[indexMap[vkeys[1]]].co;
- co[2] = subsurfedVerts[indexMap[vkeys[2]]].co;
+ co[0] = subsurfedVerts[efa->v1->tmp.l].co;
+ co[1] = subsurfedVerts[efa->v2->tmp.l].co;
+ co[2] = subsurfedVerts[efa->v3->tmp.l].co;
} else {
co[0] = efa->v1->co;
co[1] = efa->v2->co;
@@ -275,7 +274,7 @@
if(efa->v4) {
vkeys[3] = (ParamKey)efa->v4->tmp.l;
if(use_subsurf){
- co[3] = subsurfedVerts[indexMap[vkeys[3]]].co;
+ co[3] =
subsurfedVerts[indexMap[efa->v4->tmp.l]].co;
} else {
co[3] = efa->v4->co;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
