[Bf-blender-cvs] [88c2193d16b] blender2.8: Merge branch 'master' into blender2.8

Sergey Sharybin noreply at git.blender.org
Mon Jul 16 15:48:23 CEST 2018


Commit: 88c2193d16beacabcf279a59b1e0623ae2ffb068
Author: Sergey Sharybin
Date:   Mon Jul 16 15:47:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB88c2193d16beacabcf279a59b1e0623ae2ffb068

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/mesh/editmesh_utils.c
index 2ee3362063b,7a344be8e5a..23bb894dab3
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@@ -597,9 -593,10 +597,9 @@@ UvVertMap *BM_uv_vert_map_create
  			v->next = newvlist;
  			newvlist = v;
  
- 			efa = BM_face_at_index(bm, v->f);
+ 			efa = BM_face_at_index(bm, v->poly_index);
 -			/* tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
  
- 			l = BM_iter_at_index(bm, BM_LOOPS_OF_FACE, efa, v->tfindex);
+ 			l = BM_iter_at_index(bm, BM_LOOPS_OF_FACE, efa, v->loop_of_poly_index);
  			luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
  			uv = luv->uv;
  
@@@ -608,8 -605,10 +608,8 @@@
  
  			while (iterv) {
  				next = iterv->next;
- 				efa = BM_face_at_index(bm, iterv->f);
- 				l = BM_iter_at_index(bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex);
+ 				efa = BM_face_at_index(bm, iterv->poly_index);
 -				/* tf = CustomData_bmesh_get(&bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */
 -
+ 				l = BM_iter_at_index(bm, BM_LOOPS_OF_FACE, efa, iterv->loop_of_poly_index);
  				luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
  				uv2 = luv->uv;
  
diff --cc source/blender/editors/uvedit/uvedit_ops.c
index faccb44767f,375dda7dd6a..51e2c1b6334
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@@ -1203,46 -1272,46 +1203,47 @@@ static void uv_select_linked_multi
  				}
  			}
  		}
 -	}
 -	else {
 -		BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
 -			if (efa == hit_final->efa) {
 -				stack[stacksize] = a;
 -				stacksize++;
 -				flag[a] = 1;
 -				break;
 +		else {
 +			BM_ITER_MESH_INDEX (efa, &iter, em->bm, BM_FACES_OF_MESH, a) {
 +				if (efa == hit_final->efa) {
 +					stack[stacksize] = a;
 +					stacksize++;
 +					flag[a] = 1;
 +					break;
 +				}
  			}
  		}
 -	}
  
 -	while (stacksize > 0) {
 +		while (stacksize > 0) {
  
 -		stacksize--;
 -		a = stack[stacksize];
 +			stacksize--;
 +			a = stack[stacksize];
  
 -		efa = BM_face_at_index(em->bm, a);
 +			efa = BM_face_at_index(em->bm, a);
  
 -		BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
 +			BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) {
  
 -			/* make_uv_vert_map_EM sets verts tmp.l to the indices */
 -			vlist = BM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
 +				/* make_uv_vert_map_EM sets verts tmp.l to the indices */
 +				vlist = BM_uv_vert_map_at_index(vmap, BM_elem_index_get(l->v));
  
 -			startv = vlist;
 +				startv = vlist;
  
 -			for (iterv = vlist; iterv; iterv = iterv->next) {
 -				if (iterv->separate)
 -					startv = iterv;
 -				if (iterv->poly_index == a)
 -					break;
 -			}
 +				for (iterv = vlist; iterv; iterv = iterv->next) {
 +					if (iterv->separate)
 +						startv = iterv;
- 					if (iterv->f == a)
++					if (iterv->poly_index == a)
 +						break;
 +				}
 +
 +				for (iterv = startv; iterv; iterv = iterv->next) {
 +					if ((startv != iterv) && (iterv->separate))
 +						break;
- 					else if (!flag[iterv->f]) {
- 						flag[iterv->f] = 1;
- 						stack[stacksize] = iterv->f;
++					else if (!flag[iterv->poly_index]) {
++						flag[iterv->poly_index] = 1;
++						stack[stacksize] = iterv->poly_index;
 +						stacksize++;
 +					}
+ 
 -			for (iterv = startv; iterv; iterv = iterv->next) {
 -				if ((startv != iterv) && (iterv->separate))
 -					break;
 -				else if (!flag[iterv->poly_index]) {
 -					flag[iterv->poly_index] = 1;
 -					stack[stacksize] = iterv->poly_index;
 -					stacksize++;
  				}
  			}
  		}



More information about the Bf-blender-cvs mailing list