[Bf-blender-cvs] [9f669946508] temp-geometry-nodes-extrude-mesh: Remove spreadsheet changes

Hans Goudey noreply at git.blender.org
Wed Jan 5 05:39:58 CET 2022


Commit: 9f669946508c15a6eafd2b8d3584139e82db7c58
Author: Hans Goudey
Date:   Tue Jan 4 22:39:50 2022 -0600
Branches: temp-geometry-nodes-extrude-mesh
https://developer.blender.org/rB9f669946508c15a6eafd2b8d3584139e82db7c58

Remove spreadsheet changes

===================================================================

M	source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc

===================================================================

diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index a6f9f26d09d..337a6037c42 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -103,20 +103,6 @@ void GeometryDataSource::foreach_default_column_ids(
     fn({(char *)"Rotation"}, false);
     fn({(char *)"Scale"}, false);
   }
-  else if (component_->type() == GEO_COMPONENT_TYPE_MESH) {
-    if (domain_ == ATTR_DOMAIN_EDGE) {
-      fn({(char *)"v1"}, false);
-      fn({(char *)"v2"}, false);
-    }
-    else if (domain_ == ATTR_DOMAIN_FACE) {
-      fn({(char *)"loopstart"}, false);
-      fn({(char *)"totloop"}, false);
-    }
-    else if (domain_ == ATTR_DOMAIN_CORNER) {
-      fn({(char *)"v"}, false);
-      fn({(char *)"e"}, false);
-    }
-  }
 }
 
 std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values(
@@ -160,53 +146,6 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values(
           }));
     }
   }
-  else if (component_->type() == GEO_COMPONENT_TYPE_MESH) {
-    const MeshComponent &component = static_cast<const MeshComponent &>(*component_);
-    if (const Mesh *mesh = component.get_for_read()) {
-      if (domain_ == ATTR_DOMAIN_EDGE) {
-        if (STREQ(column_id.name, "v1")) {
-          return std::make_unique<ColumnValues>(
-              column_id.name, VArray<int>::ForFunc(mesh->totedge, [mesh](int64_t index) {
-                return mesh->medge[index].v1;
-              }));
-        }
-        if (STREQ(column_id.name, "v2")) {
-          return std::make_unique<ColumnValues>(
-              column_id.name, VArray<int>::ForFunc(mesh->totedge, [mesh](int64_t index) {
-                return mesh->medge[index].v2;
-              }));
-        }
-      }
-      else if (domain_ == ATTR_DOMAIN_FACE) {
-        if (STREQ(column_id.name, "loopstart")) {
-          return std::make_unique<ColumnValues>(
-              column_id.name, VArray<int>::ForFunc(mesh->totpoly, [mesh](int64_t index) {
-                return mesh->mpoly[index].loopstart;
-              }));
-        }
-        if (STREQ(column_id.name, "totloop")) {
-          return std::make_unique<ColumnValues>(
-              column_id.name, VArray<int>::ForFunc(mesh->totpoly, [mesh](int64_t index) {
-                return mesh->mpoly[index].totloop;
-              }));
-        }
-      }
-      else if (domain_ == ATTR_DOMAIN_CORNER) {
-        if (STREQ(column_id.name, "v")) {
-          return std::make_unique<ColumnValues>(
-              column_id.name, VArray<int>::ForFunc(mesh->totloop, [mesh](int64_t index) {
-                return mesh->mloop[index].v;
-              }));
-        }
-        if (STREQ(column_id.name, "e")) {
-          return std::make_unique<ColumnValues>(
-              column_id.name, VArray<int>::ForFunc(mesh->totloop, [mesh](int64_t index) {
-                return mesh->mloop[index].e;
-              }));
-        }
-      }
-    }
-  }
 
   bke::ReadAttributeLookup attribute = component_->attribute_try_get_for_read(column_id.name);
   if (!attribute) {



More information about the Bf-blender-cvs mailing list