blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2018-04-16 16:17:03 +02:00
parent 295ced9baa 047950db7c
commit cf95267456
Notes: blender-bot 2023-02-14 06:00:39 +01:00 
Referenced by issue #54665, Notifier from pose bone is not received by viewport
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -382,6 +382,43 @@ void DepsgraphNodeBuilder::end_build()
}
}
void DepsgraphNodeBuilder::build_id(ID* id) {
if (id == NULL) {
return;
}
switch (GS(id->name)) {
case ID_GR:
build_group((Group *)id);
break;
case ID_OB:
build_object(-1, (Object *)id, DEG_ID_LINKED_INDIRECTLY);
break;
case ID_NT:
build_nodetree((bNodeTree *)id);
break;
case ID_MA:
build_material((Material *)id);
break;
case ID_TE:
build_texture((Tex *)id);
break;
case ID_IM:
build_image((Image *)id);
break;
case ID_WO:
build_world((World *)id);
break;
case ID_MSK:
build_mask((Mask *)id);
break;
case ID_MC:
build_movieclip((MovieClip *)id);
break;
default:
fprintf(stderr, "Unhandled ID %s\n", id->name);
}
}
void DepsgraphNodeBuilder::build_group(Group *group)
{
if (built_map_.checkIsBuiltAndTag(group)) {
@ -698,6 +735,7 @@ void DepsgraphNodeBuilder::build_driver_variables(ID * id, FCurve *fcurve)
LISTBASE_FOREACH (DriverVar *, dvar, &fcurve->driver->variables) {
DRIVER_TARGETS_USED_LOOPER(dvar)
{
build_id(dtar->id);
build_driver_id_property(dtar->id, dtar->rna_path);
}
DRIVER_TARGETS_LOOPER_END

1
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
View File

@ -157,6 +157,7 @@ struct DepsgraphNodeBuilder {
const char *name = "",
int name_tag = -1);
void build_id(ID* id);
void build_view_layer(Scene *scene,
ViewLayer *view_layer,
eDepsNode_LinkedState_Type linked_state);