[Bf-blender-cvs] [5639dcef623] temp-attribute-processor: Fix after merge

[Jacques Lucke]

Commit: 5639dcef62344a52c9da95d46b56b4691fc53035
Author: Jacques Lucke
Date:   Wed Jun 23 18:54:05 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB5639dcef62344a52c9da95d46b56b4691fc53035

Fix after merge

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

M	source/blender/blenkernel/intern/node.cc

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 5ce3e0788e6..35470010aa8 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -777,24 +777,24 @@ void ntreeBlendReadData(BlendDataReader *reader, bNodeTree *ntree)
           BLO_read_data_address(reader, &storage->string);
           break;
         }
-        case GEO_NODE_ATTRIBUTE_PROCESSOR: {
-          NodeGeometryAttributeProcessor *storage = (NodeGeometryAttributeProcessor *)
-                                                        node->storage;
-          BLO_read_list(reader, &storage->inputs_settings);
-          BLO_read_list(reader, &storage->outputs_settings);
-          LISTBASE_FOREACH (
-              AttributeProcessorInputSettings *, input_settings, &storage->inputs_settings) {
-            BLO_read_data_address(reader, &input_settings->identifier);
-          }
-          LISTBASE_FOREACH (
-              AttributeProcessorOutputSettings *, output_settings, &storage->outputs_settings) {
-            BLO_read_data_address(reader, &output_settings->identifier);
-          }
-          break;
-        }
         default:
           break;
       }
+      /* TODO: Handling this separately now so that it doesn't break when node->type changes when
+       * merging master. */
+      if (STREQ(node->idname, "GeometryNodeAttributeProcessor")) {
+        NodeGeometryAttributeProcessor *storage = (NodeGeometryAttributeProcessor *)node->storage;
+        BLO_read_list(reader, &storage->inputs_settings);
+        BLO_read_list(reader, &storage->outputs_settings);
+        LISTBASE_FOREACH (
+            AttributeProcessorInputSettings *, input_settings, &storage->inputs_settings) {
+          BLO_read_data_address(reader, &input_settings->identifier);
+        }
+        LISTBASE_FOREACH (
+            AttributeProcessorOutputSettings *, output_settings, &storage->outputs_settings) {
+          BLO_read_data_address(reader, &output_settings->identifier);
+        }
+      }
     }
   }
   BLO_read_list(reader, &ntree->links);