[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47744] trunk/blender/extern/eltopo/ eltopo3d/dynamicsurface.h: El Topo: Fix pinned vertices/edges/faces.

[Daniel Genrich]

Revision: 47744
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47744
Author:   genscher
Date:     2012-06-11 13:35:06 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
El Topo: Fix pinned vertices/edges/faces. (Local fix, submitted to lib creator)

Modified Paths:
--------------
    trunk/blender/extern/eltopo/eltopo3d/dynamicsurface.h

Modified: trunk/blender/extern/eltopo/eltopo3d/dynamicsurface.h
===================================================================
--- trunk/blender/extern/eltopo/eltopo3d/dynamicsurface.h	2012-06-11 13:00:35 UTC (rev 47743)
+++ trunk/blender/extern/eltopo/eltopo3d/dynamicsurface.h	2012-06-11 13:35:06 UTC (rev 47744)
@@ -759,7 +759,7 @@
 inline bool DynamicSurface::edge_is_solid( size_t e ) const
 {
     const Vec2st& edge = m_mesh.m_edges[e];
-    return ( vertex_is_solid(edge[0]) && vertex_is_solid(edge[1]) );
+    return ( vertex_is_solid(edge[0]) || vertex_is_solid(edge[1]) );
 }
 
 // --------------------------------------------------------
@@ -771,7 +771,7 @@
 inline bool DynamicSurface::triangle_is_solid( size_t t ) const
 {
     const Vec3st& tri = m_mesh.get_triangle(t);
-    return ( vertex_is_solid(tri[0]) && vertex_is_solid(tri[1]) && vertex_is_solid(tri[2]) );
+    return ( vertex_is_solid(tri[0]) || vertex_is_solid(tri[1]) || vertex_is_solid(tri[2]) );
 }