[Bf-blender-cvs] [367b0653690] functions: Merge branch 'master' into functions

Jacques Lucke noreply at git.blender.org
Thu Feb 28 12:41:32 CET 2019


Commit: 367b06536906a0cc4f2d03c1709d2669096d62bc
Author: Jacques Lucke
Date:   Thu Feb 28 11:45:46 2019 +0100
Branches: functions
https://developer.blender.org/rB367b06536906a0cc4f2d03c1709d2669096d62bc

Merge branch 'master' into functions

===================================================================



===================================================================

diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index c77b192c42c,9aab90f88cf..71cf96f88d8
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@@ -1553,17 -1550,7 +1552,18 @@@ void DepsgraphRelationBuilder::build_dr
  				continue;
  			}
  			build_id(dtar->id);
 +
 +			if (dvar->type == DVAR_TYPE_FUNCTION) {
 +				auto fn = (BLI::RefCounted<FN::Function> *)get_driver_variable_function(dvar);
 +				if (fn != NULL) {
 +					FN::Dependencies dependencies;
 +					fn->ptr()->body<FN::TupleCallBody>()->dependencies(dependencies);
 +					dependencies.add_relations(*this, driver_key);
 +					fn->decref();
 +				}
 +			}
 +
+ 			build_driver_id_property(dtar->id, dtar->rna_path);
  			/* Initialize relations coming to proxy_from. */
  			Object *proxy_from = NULL;
  			if ((GS(dtar->id->name) == ID_OB) &&



More information about the Bf-blender-cvs mailing list