[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46228] trunk/blender/source/blender/ editors/uvedit/uvedit_smart_stitch.c: Fix #31178, the cause is hidden and selected faces would return NULL as UVElements.

Antony Riakiotakis kalast at gmail.com
Thu May 3 12:56:35 CEST 2012


Revision: 46228
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46228
Author:   psy-fi
Date:     2012-05-03 10:56:35 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Fix #31178, the cause is hidden and selected faces would return NULL as UVElements. To avoid checking the whole contingency of UV synch selection + face selection + face hidden, added a NULL check.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2012-05-03 10:40:04 UTC (rev 46227)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2012-05-03 10:56:35 UTC (rev 46228)
@@ -1179,13 +1179,13 @@
 	}
 	else {
 		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			i = 0;
-			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+			BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 				if (uvedit_uv_select_test(em, scene, l)) {
 					UvElement *element = ED_uv_element_get(state->element_map, efa, l);
-					stitch_select_uv(element, state, 1);
+					if (element) {
+						stitch_select_uv(element, state, 1);
+					}
 				}
-				i++;
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list