[Bf-blender-cvs] [0f91a7c] soc-2014-shapekey: Fix stupid logic error.
Bastien Montagne
noreply at git.blender.org
Fri Nov 14 13:02:22 CET 2014
Commit: 0f91a7c528096610b1f85815d0b9445f7cd3b900
Author: Bastien Montagne
Date: Fri Nov 14 12:35:15 2014 +0100
Branches: soc-2014-shapekey
https://developer.blender.org/rB0f91a7c528096610b1f85815d0b9445f7cd3b900
Fix stupid logic error.
===================================================================
M source/blender/blenkernel/intern/editmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 5aad2f7..02cbc43 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -261,8 +261,8 @@ void BKE_editmesh_topochange_calc(BMEditMesh *em)
bool BKE_editmesh_topo_has_changed(BMEditMesh *em)
{
- if (em->bm->totvert == em->topochange.totvert || em->bm->totedge == em->topochange.totedge ||
- em->bm->totloop == em->topochange.totloop || em->bm->totface == em->topochange.totface)
+ if (em->bm->totvert == em->topochange.totvert && em->bm->totedge == em->topochange.totedge &&
+ em->bm->totloop == em->topochange.totloop && em->bm->totface == em->topochange.totface)
{
int hash = BM_mesh_topology_hash(em->bm);
if (hash == em->topochange.topohash)
More information about the Bf-blender-cvs
mailing list