[MERGE]

src/modules/lic/WMLIC.cpp

@@ -25,7 +25,6 @@
 #include <string>
 
 #include "../../kernel/WKernel.h"
-
 #include "WMLIC.h"
 
 WMLIC::WMLIC():

src/modules/lic/WMLIC.h

@@ -29,11 +29,11 @@
 
 #include <osg/Geode>
 
+#include "../../dataHandler/WDataSetVector.h"
+#include "../../graphicsEngine/WTriangleMesh2.h"
 #include "../../kernel/WModule.h"
 #include "../../kernel/WModuleInputData.h"
 #include "../../kernel/WModuleOutputData.h"
-#include "../../graphicsEngine/WTriangleMesh2.h"
-#include "../../dataHandler/WDataSetVector.h"
 
 /**
  * Computes a Line Intregrated Convolution from a vector field onto a triangle mesh.
@@ -43,7 +43,6 @@
 class WMLIC: public WModule
 {
 public:
-
     /**
      * Constructs a new LIC module
      */

src/modules/lic/fibernavigator/triangleMesh.cpp

@@ -20,6 +20,17 @@ TriangleMesh::TriangleMesh ( boost::shared_ptr< WTriangleMesh2 > mesh, boost::sh
     m_triangleTensorsCalculated = false;
 
     defaultColor = WColor( 0.78, 0.78, 0.78, 1.0 );
+    // copy vertices
+    for( size_t i = 0; i < mesh->vertSize(); ++i )
+    {
+        wmath::WPosition pos = mesh->getVertexAsPosition( i );
+        fastAddVert( Vector( pos[0], pos[1], pos[2] ) );
+    }
+    // copy triangles
+    for( size_t i = 0; i < mesh->triangleSize(); ++i )
+    {
+        fastAddTriangle( mesh->getTriVertId0( i ), mesh->getTriVertId1( i ), mesh->getTriVertId2( i ) );
+    }
 }
 
 TriangleMesh::~TriangleMesh ()