Merge pull request #264 from inviwo/fix/core-changes

Various: core changes

Author: petersteneteg

misc/vtk/src/processors/vtktomesh.cpp

@@ -212,7 +212,7 @@ void VTKToMesh::process() {
                          util::makeIndexBuffer(std::move(triangles)));
     }
 
-    if (mesh->getNumberOfIndicies() > 0) {
+    if (mesh->getNumberOfIndices() > 0) {
         outport_.setData(mesh);
     } else {
         outport_.setData(nullptr);

molvis/molvisgl/src/processors/molecularmeshrenderer.cpp

@@ -128,10 +128,10 @@ void MolecularMeshRenderer::process() {
 
     auto drawMesh = [](std::shared_ptr<const Mesh> mesh, MeshDrawerGL::DrawObject& drawer,
                        DrawType dt) {
-        if ((mesh->getNumberOfIndicies() == 0) && (mesh->getDefaultMeshInfo().dt == dt)) {
+        if ((mesh->getNumberOfIndices() == 0) && (mesh->getDefaultMeshInfo().dt == dt)) {
             drawer.draw();
         } else {
-            for (size_t i = 0; i < mesh->getNumberOfIndicies(); ++i) {
+            for (size_t i = 0; i < mesh->getNumberOfIndices(); ++i) {
                 if (mesh->getIndexMeshInfo(i).dt == dt) {
                     drawer.draw(i);
                 }

molvis/molvisgl/src/processors/molecularrasterizer.cpp

@@ -304,10 +304,10 @@ void MolecularRasterizer::rasterize(const ivec2& imageSize, const mat4& worldMat
 
     auto drawMesh = [](std::shared_ptr<const Mesh> mesh, MeshDrawerGL::DrawObject& drawer,
                        DrawType dt) {
-        if ((mesh->getNumberOfIndicies() == 0) && (mesh->getDefaultMeshInfo().dt == dt)) {
+        if ((mesh->getNumberOfIndices() == 0) && (mesh->getDefaultMeshInfo().dt == dt)) {
             drawer.draw();
         } else {
-            for (size_t i = 0; i < mesh->getNumberOfIndicies(); ++i) {
+            for (size_t i = 0; i < mesh->getNumberOfIndices(); ++i) {
                 if (mesh->getIndexMeshInfo(i).dt == dt) {
                     drawer.draw(i);
                 }

molvis/molvisgl/src/processors/molecularrenderer.cpp

@@ -216,10 +216,10 @@ void MolecularRenderer::process() {
 
     auto drawMesh = [](std::shared_ptr<const Mesh> mesh, MeshDrawerGL::DrawObject& drawer,
                        DrawType dt) {
-        if ((mesh->getNumberOfIndicies() == 0) && (mesh->getDefaultMeshInfo().dt == dt)) {
+        if ((mesh->getNumberOfIndices() == 0) && (mesh->getDefaultMeshInfo().dt == dt)) {
             drawer.draw();
         } else {
-            for (size_t i = 0; i < mesh->getNumberOfIndicies(); ++i) {
+            for (size_t i = 0; i < mesh->getNumberOfIndices(); ++i) {
                 if (mesh->getIndexMeshInfo(i).dt == dt) {
                     drawer.draw(i);
                 }