[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34735] trunk/blender/source/blender/ blenkernel/intern/mesh.c: bugfix [#25523] Face extrude will crash Blender if array and subsurf modifier are added to mesh object

[Campbell Barton]

Revision: 34735
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34735
Author:   campbellbarton
Date:     2011-02-09 03:49:59 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
bugfix [#25523] Face extrude will crash Blender if array and subsurf modifier 
are added to mesh object
test_index_face() failed to fix indices like (6,0,0,6), making it (0,6,6,0).

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

Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c       2011-02-09 
03:48:40 UTC (rev 34734)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c       2011-02-09 
03:49:59 UTC (rev 34735)
@@ -444,7 +444,7 @@
                mface->v4= 0;
                nr--;
        }
-       if(mface->v2 && mface->v2==mface->v3) {
+       if((mface->v2 || mface->v4) && mface->v2==mface->v3) {
                mface->v3= mface->v4;
                mface->v4= 0;
                nr--;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs