[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37921] branches/soc-2011-avocado/blender: Bugfix of recursive implementation.

[shuvro sarker]

Revision: 37921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37921
Author:   shuvro
Date:     2011-06-28 17:59:06 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Bugfix of recursive implementation. Now this can work with meshes having separate parts.

Modified Paths:
--------------
    branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp
    branches/soc-2011-avocado/blender/intern/autoseam/autoseam_C_API.cpp
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c

Modified: branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp	2011-06-28 16:57:25 UTC (rev 37920)
+++ branches/soc-2011-avocado/blender/intern/autoseam/AutoseamAdjacency.cpp	2011-06-28 17:59:06 UTC (rev 37921)
@@ -11,8 +11,7 @@
 {
     m_adjacency(row, col) = value;
     m_adjacency(col, row) = value;
-    //  m_adjacency(row, col) = 1.0f;
-    //  m_adjacency(col, row) = 1.0f;
+   
 }
 
 

Modified: branches/soc-2011-avocado/blender/intern/autoseam/autoseam_C_API.cpp
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/autoseam_C_API.cpp	2011-06-28 16:57:25 UTC (rev 37920)
+++ branches/soc-2011-avocado/blender/intern/autoseam/autoseam_C_API.cpp	2011-06-28 17:59:06 UTC (rev 37921)
@@ -70,7 +70,7 @@
 int autoseam_is_adjacent(AUTOSEAM_Adjacency handle, int row, int col)
 {
     AutoseamAdjacency *adj = reinterpret_cast<AutoseamAdjacency*>(handle);
-    return adj->get(row, col);
+    return adj->get(row, col)? 1 : 0;
 }
 
 float autoseam_get_value(AUTOSEAM_Adjacency handle, int row, int col)

Modified: branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2011-06-28 16:57:25 UTC (rev 37920)
+++ branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2011-06-28 17:59:06 UTC (rev 37921)
@@ -266,7 +266,8 @@
         
         for(j = i+1; j < nminus; j++){
             if(autoseam_is_adjacent(adj_big, fminus[i], fminus[j])){
-                autoseam_set_adjacent(adj_plus, i, j, autoseam_get_value(adj_big, fminus[i], fminus[j]));
+                //printf("value is %d and %d range: %d\n",i,j, nminus);
+                autoseam_set_adjacent(adj_minus, i, j, autoseam_get_value(adj_big, fminus[i], fminus[j]));
                 
             }
         }