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
This commit is contained in:
parent
e1cb2a226c
commit
b67dca9b76
|
@ -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);
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -130,7 +130,6 @@ enum class NodeType {
|
|||
PARTICLE_SETTINGS,
|
||||
/* Material Shading Component */
|
||||
SHADING,
|
||||
SHADING_PARAMETERS,
|
||||
/* Point cache Component */
|
||||
POINT_CACHE,
|
||||
/* Image Animation Component */
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue