[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57266] trunk/blender/source/blender/ editors/uvedit/uvedit_smart_stitch.c: Fix #35651, #35645.

Antony Riakiotakis kalast at gmail.com
Thu Jun 6 16:06:13 CEST 2013


Revision: 57266
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57266
Author:   psy-fi
Date:     2013-06-06 14:06:12 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
Fix #35651, #35645.
Hidden faces do not get UvElements generated so essentially this caused
a null point reference on edge lookup.

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	2013-06-06 11:18:39 UTC (rev 57265)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c	2013-06-06 14:06:12 UTC (rev 57266)
@@ -1888,6 +1888,9 @@
 			state->selection_stack = MEM_mallocN(sizeof(*state->selection_stack) * state->total_separate_edges, "uv_stitch_selection_stack");
 
 			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!(ts->uv_flag & UV_SYNC_SELECTION) && ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || !BM_elem_flag_test(efa, BM_ELEM_SELECT)))
+					continue;
+
 				BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 					if (uvedit_edge_select_test(scene, l, cd_loop_uv_offset)) {
 						UvEdge *edge = uv_edge_get(l, state);




More information about the Bf-blender-cvs mailing list