[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41106] branches/soc-2011-onion-uv-tools/ source/blender: fix crasher when part of mesh was selected when stitching

[Antony Riakiotakis]

Revision: 41106
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41106
Author:   psy-fi
Date:     2011-10-18 19:13:36 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
fix crasher when part of mesh was selected when stitching

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c	2011-10-18 12:54:23 UTC (rev 41105)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c	2011-10-18 19:13:36 UTC (rev 41106)
@@ -2703,7 +2703,11 @@
 
 	/* Now, on to generate our uv connectivity data */
 	for(efa = stitch_state->em->faces.first, counter = 0; efa; efa = efa->next){
-		int nverts = efa->v4 ? 4 : 3;
+		int nverts;
+
+		if(!(ts->uv_flag & UV_SYNC_SELECTION) || (!efa->h && efa->f & SELECT))
+			continue;
+		nverts = efa->v4 ? 4 : 3;
 		for(i = 0; i < nverts; i++){
 			int offset1, itmp1 = get_uv_element(stitch_state->elementMap, efa, i) - stitch_state->elementMap->buf;
 			int offset2, itmp2 = get_uv_element(stitch_state->elementMap, efa, (i+1)%nverts) - stitch_state->elementMap->buf;

Modified: branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h	2011-10-18 12:54:23 UTC (rev 41105)
+++ branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h	2011-10-18 19:13:36 UTC (rev 41106)
@@ -404,7 +404,6 @@
 	int pad3;
 
 	char author[80];	/* author name for file formats supporting it */
-	int pad4;
 } UserDef;
 
 extern UserDef U; /* from blenkernel blender.c */