blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

Depsgraph: Add utility function to check whether modifier depends on time 

Currently unused, based on the code from old depsgraph.c. The purpose is to
re-sue the code over old and new depsgraph in an easy way.
This commit is contained in:
Sergey Sharybin 2015-05-12 13:38:55 +05:00
parent 31f0c27ae7
commit 08d87514d3
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_object.h
View File

@ -47,6 +47,7 @@ struct MovieClip;
struct Main;
struct RigidBodyWorld;
struct HookModifierData;
struct ModifierData;
void BKE_object_workob_clear(struct Object *workob);
void BKE_object_workob_calc_parent(struct Scene *scene, struct Object *ob, struct Object *workob);
@ -232,6 +233,8 @@ void BKE_object_groups_clear(struct Scene *scene, struct Base *base,
struct KDTree *BKE_object_as_kdtree(struct Object *ob, int *r_tot);
bool BKE_object_modifier_use_time(struct Object *ob, struct ModifierData *md);
#ifdef __cplusplus
}
#endif

48
source/blender/blenkernel/intern/object.c
View File

@ -3891,3 +3891,51 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
*r_tot = tot;
return tree;
}
bool BKE_object_modifier_use_time(Object *ob, ModifierData *md)
{
if (modifier_dependsOnTime(md)) {
return true;
}
/* Check whether modifier is animated. */
/* TODO: this should be handled as part of build_animdata() -- Aligorith */
if (ob->adt) {
AnimData *adt = ob->adt;
FCurve *fcu;
char pattern[MAX_NAME + 10];
/* TODO(sergey): Escape modifier name. */
BLI_snprintf(pattern, sizeof(pattern), "modifiers[%s", md->name);
/* action - check for F-Curves with paths containing 'modifiers[' */
if (adt->action) {
for (fcu = (FCurve *)adt->action->curves.first;
fcu != NULL;
fcu = (FCurve *)fcu->next)
{
if (fcu->rna_path && strstr(fcu->rna_path, pattern))
return true;
}
}
/* This here allows modifier properties to get driven and still update properly
*
* Workaround to get [#26764] (e.g. subsurf levels not updating when animated/driven)
* working, without the updating problems ([#28525] [#28690] [#28774] [#28777]) caused
* by the RNA updates cache introduced in r.38649
*/
for (fcu = (FCurve *)adt->drivers.first;
fcu != NULL;
fcu = (FCurve *)fcu->next)
{
if (fcu->rna_path && strstr(fcu->rna_path, pattern))
return true;
}
/* XXX: also, should check NLA strips, though for now assume that nobody uses
* that and we can omit that for performance reasons... */
}
return false;
}