[Bf-blender-cvs] [030830be9a1] blender2.8: Revert "Fix texture space not updating in edit mode."

Campbell Barton noreply at git.blender.org
Tue Nov 27 04:20:36 CET 2018


Commit: 030830be9a11459502d467ea974baa079d83c52d
Author: Campbell Barton
Date:   Tue Nov 27 14:18:33 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB030830be9a11459502d467ea974baa079d83c52d

Revert "Fix texture space not updating in edit mode."

This reverts commit 3a038db576e97c0e720a92af05a218ed71ed121a.

Caused CoW crash switching from edit to sculpt mode.

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

M	source/blender/blenkernel/intern/mesh.c
M	source/blender/bmesh/intern/bmesh_mesh.c
M	source/blender/bmesh/intern/bmesh_mesh.h

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

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index aa41cf3bc10..1400fbd514e 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -876,10 +876,7 @@ void BKE_mesh_boundbox_calc(Mesh *me, float r_loc[3], float r_size[3])
 	if (!r_size) r_size = msize;
 
 	INIT_MINMAX(min, max);
-	if (!(me->edit_btmesh ?
-	    BM_mesh_minmax(me->edit_btmesh->bm, min, max) :
-	    BKE_mesh_minmax(me, min, max)))
-	{
+	if (!BKE_mesh_minmax(me, min, max)) {
 		min[0] = min[1] = min[2] = -1.0f;
 		max[0] = max[1] = max[2] = 1.0f;
 	}
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 9d100793fc4..50aa3f08fbc 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -2499,18 +2499,3 @@ void BM_mesh_toolflags_set(BMesh *bm, bool use_toolflags)
 
 	bm->use_toolflags = use_toolflags;
 }
-
-/**
- * Calculate the minimum and maximum coordinates of the box that encompasses this mesh.
- */
-bool BM_mesh_minmax(BMesh *bm, float r_min[3], float r_max[3])
-{
-	BMIter iter;
-	BMVert *v;
-
-	BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
-		minmax_v3v3_v3(r_min, r_max, v->co);
-	}
-
-	return (bm->totvert != 0);
-}
diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h
index 5497bc7aee9..dfd76c6b89f 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.h
+++ b/source/blender/bmesh/intern/bmesh_mesh.h
@@ -132,8 +132,6 @@ void BM_mesh_rebuild(
         BMesh *bm, const struct BMeshCreateParams *params,
         struct BLI_mempool *vpool, struct BLI_mempool *epool, struct BLI_mempool *lpool, struct BLI_mempool *fpool);
 
-bool BM_mesh_minmax(BMesh *bm, float r_min[3], float r_max[3]);
-
 typedef struct BMAllocTemplate {
 	int totvert, totedge, totloop, totface;
 } BMAllocTemplate;



More information about the Bf-blender-cvs mailing list