blender
/
blender
133
398
Fork 577
Code Issues 6.3k Pull Requests 742 Projects 19 Wiki Activity

Fix T66370: add_relation Message in Console with certain shaders

This commit is contained in:
Sergey Sharybin 2019-07-03 14:27:28 +02:00
parent bad5c379c6
commit 65b2cc2301
Notes: blender-bot 2023-02-14 08:38:11 +01:00 
Referenced by issue #66370, add_relation Message in Console with certain shaders
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -200,6 +200,11 @@ static OperationCode bone_target_opcode(ID *target,
return OperationCode::BONE_DONE;
}
static bool object_have_geometry_component(const Object *object)
{
return ELEM(object->type, OB_MESH, OB_CURVE, OB_FONT, OB_SURF, OB_MBALL, OB_LATTICE, OB_GPENCIL);
}
/* **** General purpose functions **** */
DepsgraphRelationBuilder::DepsgraphRelationBuilder(Main *bmain,
@ -2157,9 +2162,11 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
else if (id_type == ID_OB) {
build_object(NULL, (Object *)id);
ComponentKey object_transform_key(id, NodeType::TRANSFORM);
ComponentKey object_geometry_key(id, NodeType::GEOMETRY);
add_relation(object_transform_key, shading_key, "Object Transform -> Node");
add_relation(object_geometry_key, shading_key, "Object Geometry -> Node");
if (object_have_geometry_component(reinterpret_cast<Object *>(id))) {
ComponentKey object_geometry_key(id, NodeType::GEOMETRY);
add_relation(object_geometry_key, shading_key, "Object Geometry -> Node");
}
}
else if (id_type == ID_SCE) {
Scene *node_scene = (Scene *)id;