From b67dca9b7674bed797fd04fcec790d809ed8dfb8 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 30 Nov 2021 12:14:23 +0100 Subject: Depsgraph: remove shading parameters component This component served no purpose anymore. It was technical dept from the early 2.80 days. Differential Revision: https://developer.blender.org/D13422 --- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 1 - .../blender/depsgraph/intern/builder/deg_builder_relations.cc | 7 ++----- .../depsgraph/intern/debug/deg_debug_relations_graphviz.cc | 10 ++++------ source/blender/depsgraph/intern/depsgraph_tag.cc | 7 +------ source/blender/depsgraph/intern/node/deg_node.cc | 4 ---- source/blender/depsgraph/intern/node/deg_node.h | 1 - source/blender/depsgraph/intern/node/deg_node_component.cc | 2 -- 7 files changed, 7 insertions(+), 25 deletions(-) (limited to 'source/blender/depsgraph/intern') diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 6c37ba8bfb3..7da3ab78575 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1730,7 +1730,6 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree) build_animdata(&ntree->id); /* Shading update. */ add_operation_node(&ntree->id, NodeType::SHADING, OperationCode::MATERIAL_UPDATE); - add_operation_node(&ntree->id, NodeType::SHADING_PARAMETERS, OperationCode::MATERIAL_UPDATE); /* nodetree's nodes... */ LISTBASE_FOREACH (bNode *, bnode, &ntree->nodes) { build_idproperties(bnode->prop); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 3bc5385ae6f..a333f67839a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2528,16 +2528,13 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree) } OperationKey shading_update_key(&ntree->id, NodeType::SHADING, OperationCode::MATERIAL_UPDATE); - OperationKey shading_parameters_key( - &ntree->id, NodeType::SHADING_PARAMETERS, OperationCode::MATERIAL_UPDATE); - add_relation(shading_parameters_key, shading_update_key, "NTree Shading Parameters"); if (check_id_has_anim_component(&ntree->id)) { ComponentKey animation_key(&ntree->id, NodeType::ANIMATION); - add_relation(animation_key, shading_parameters_key, "NTree Shading Parameters"); + add_relation(animation_key, shading_update_key, "NTree Shading Parameters"); } ComponentKey parameters_key(&ntree->id, NodeType::PARAMETERS); - add_relation(parameters_key, shading_parameters_key, "NTree Shading Parameters"); + add_relation(parameters_key, shading_update_key, "NTree Shading Parameters"); } /* Recursively build graph for material */ diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc index 63f3d4f91f4..7be661d9668 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc @@ -105,11 +105,10 @@ static const int deg_debug_node_type_color_map[][2] = { {NodeType::GEOMETRY, 6}, {NodeType::SEQUENCER, 7}, {NodeType::SHADING, 8}, - {NodeType::SHADING_PARAMETERS, 9}, - {NodeType::CACHE, 10}, - {NodeType::POINT_CACHE, 11}, - {NodeType::LAYER_COLLECTIONS, 12}, - {NodeType::COPY_ON_WRITE, 13}, + {NodeType::CACHE, 9}, + {NodeType::POINT_CACHE, 10}, + {NodeType::LAYER_COLLECTIONS, 11}, + {NodeType::COPY_ON_WRITE, 12}, {-1, 0}, }; #endif @@ -411,7 +410,6 @@ static void deg_debug_graphviz_node(DotExportContext &ctx, case NodeType::EVAL_POSE: case NodeType::BONE: case NodeType::SHADING: - case NodeType::SHADING_PARAMETERS: case NodeType::CACHE: case NodeType::POINT_CACHE: case NodeType::IMAGE_ANIMATION: diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index dd96c5a3b2b..60c64e19bde 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -193,12 +193,7 @@ void depsgraph_tag_to_component_opcode(const ID *id, *component_type = NodeType::COPY_ON_WRITE; break; case ID_RECALC_SHADING: - if (id_type == ID_NT) { - *component_type = NodeType::SHADING_PARAMETERS; - } - else { - *component_type = NodeType::SHADING; - } + *component_type = NodeType::SHADING; break; case ID_RECALC_SELECT: depsgraph_select_tag_to_component_opcode(id, component_type, operation_code); diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 650ce7757b9..22345a85576 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -94,8 +94,6 @@ const char *nodeTypeAsString(NodeType type) return "PARTICLE_SETTINGS"; case NodeType::SHADING: return "SHADING"; - case NodeType::SHADING_PARAMETERS: - return "SHADING_PARAMETERS"; case NodeType::CACHE: return "CACHE"; case NodeType::POINT_CACHE: @@ -161,7 +159,6 @@ eDepsSceneComponentType nodeTypeToSceneComponent(NodeType type) case NodeType::GENERIC_DATABLOCK: case NodeType::PARTICLE_SYSTEM: case NodeType::PARTICLE_SETTINGS: - case NodeType::SHADING_PARAMETERS: case NodeType::POINT_CACHE: case NodeType::IMAGE_ANIMATION: case NodeType::BATCH_CACHE: @@ -248,7 +245,6 @@ eDepsObjectComponentType nodeTypeToObjectComponent(NodeType type) case NodeType::GENERIC_DATABLOCK: case NodeType::PARTICLE_SYSTEM: case NodeType::PARTICLE_SETTINGS: - case NodeType::SHADING_PARAMETERS: case NodeType::POINT_CACHE: case NodeType::IMAGE_ANIMATION: case NodeType::BATCH_CACHE: diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h index 01d49640053..a5c58d163a7 100644 --- a/source/blender/depsgraph/intern/node/deg_node.h +++ b/source/blender/depsgraph/intern/node/deg_node.h @@ -130,7 +130,6 @@ enum class NodeType { PARTICLE_SETTINGS, /* Material Shading Component */ SHADING, - SHADING_PARAMETERS, /* Point cache Component */ POINT_CACHE, /* Image Animation Component */ diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index 695d78ae18e..7d56ef44979 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -334,7 +334,6 @@ DEG_COMPONENT_NODE_DEFINE(Pose, EVAL_POSE, ID_RECALC_GEOMETRY); DEG_COMPONENT_NODE_DEFINE(Proxy, PROXY, ID_RECALC_GEOMETRY); DEG_COMPONENT_NODE_DEFINE(Sequencer, SEQUENCER, 0); DEG_COMPONENT_NODE_DEFINE(Shading, SHADING, ID_RECALC_SHADING); -DEG_COMPONENT_NODE_DEFINE(ShadingParameters, SHADING_PARAMETERS, ID_RECALC_SHADING); DEG_COMPONENT_NODE_DEFINE(Transform, TRANSFORM, ID_RECALC_TRANSFORM); DEG_COMPONENT_NODE_DEFINE(ObjectFromLayer, OBJECT_FROM_LAYER, 0); DEG_COMPONENT_NODE_DEFINE(Dupli, DUPLI, 0); @@ -365,7 +364,6 @@ void deg_register_component_depsnodes() register_node_typeinfo(&DNTI_EVAL_POSE); register_node_typeinfo(&DNTI_SEQUENCER); register_node_typeinfo(&DNTI_SHADING); - register_node_typeinfo(&DNTI_SHADING_PARAMETERS); register_node_typeinfo(&DNTI_TRANSFORM); register_node_typeinfo(&DNTI_OBJECT_FROM_LAYER); register_node_typeinfo(&DNTI_DUPLI); -- cgit v1.2.3