diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-15 13:12:59 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-09-15 13:14:54 +0300 |
commit | 52181a26c68782878ff27c62d16acb871c66614a (patch) | |
tree | 36edf8e2a057fdeff3aa9350cdb73302c9f24551 | |
parent | ddbbcbbbbaecd9903bfc9bc40a43d20bd1085754 (diff) |
Depsgraph: Avoid some false-positive time dependencies of scripted drivers
This was quite weak to consider all scripted expression to be time-dependent.
Current solution is somewhat better but still crappy. Not sure how can we make
it really nice.
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 2148a3501d8..09c7d9ab9de 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -115,6 +115,32 @@ namespace DEG { /* ***************** */ /* Relations Builder */ +/* TODO(sergey): This is somewhat weak, but we don't want neither false-positive + * time dependencies nor special exceptions in the depsgraph evaluation. + */ +static bool python_driver_depends_on_time(ChannelDriver *driver) +{ + if (driver->expression[0] == '\0') { + /* Empty expression depends on nothing. */ + return false; + } + if (strchr(driver->expression, '(') != NULL) { + /* Function calls are considered dependent on a time. */ + return true; + } + if (strstr(driver->expression, "time") != NULL) { + /* Variable `time` depends on time. */ + /* TODO(sergey): This is a bit weak, but not sure about better way of + * handling this. + */ + return true; + } + /* Possible indirect time relation s should be handled via variable + * targets. + */ + return false; +} + /* **** General purpose functions **** */ RNAPathKey::RNAPathKey(ID *id, const char *path) : @@ -1016,7 +1042,9 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu) * so for now we'll be quite conservative here about optimization and consider * all python drivers to be depending on time. */ - if (driver->type == DRIVER_TYPE_PYTHON) { + if ((driver->type == DRIVER_TYPE_PYTHON) && + python_driver_depends_on_time(driver)) + { TimeSourceKey time_src_key; add_relation(time_src_key, driver_key, DEPSREL_TYPE_TIME, "[TimeSrc -> Driver]"); } |