Revision: 43444
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43444
Author: campbellbarton
Date: 2012-01-17 05:25:11 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43436:43443
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43436
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43436
+
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43443
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2012-01-17 05:22:27 UTC (rev 43443)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2012-01-17 05:25:11 UTC (rev 43444)
@@ -2483,7 +2483,7 @@
mesh_loops_to_mface_corners(fdata, ldata, pdata,
lindex, k, i, 3,
numTex, numCol,
hasWCol);
- test_index_face(mf, fdata, totface, 3);
+ test_index_face(mf, fdata, k, 3);
}
else {
/*sort loop indices to ensure winding is
correct*/
@@ -2503,7 +2503,7 @@
mesh_loops_to_mface_corners(fdata, ldata, pdata,
lindex, k, i, 4,
numTex, numCol,
hasWCol);
- test_index_face(mf, fdata, totface, 4);
+ test_index_face(mf, fdata, k, 4);
}
mf->edcode= 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
