diff options
| author | Joshua Leung <aligorith@gmail.com> | 2012-07-03 09:30:19 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2012-07-03 09:30:19 +0400 |
| commit | d58cb1beaa20ca7803a5adaf5ebb1e9ccfc79970 (patch) | |
| tree | 19b36d283da021c52a085a368e1cab6cf625b1c6 /source/blender/blenkernel/intern/depsgraph.c | |
| parent | c960d1692f4003c186b616806aa0c79e71ce4cb5 (diff) | |
Followup for r.48515
* Removed material driver creation hack. However, the textures one remains, as
texture eval isn't ready yet
* Shuffled some code
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 99c3b17dee2..65d36d665db 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -66,6 +66,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" +#include "BKE_material.h" #include "BKE_mball.h" #include "BKE_modifier.h" #include "BKE_object.h" @@ -311,7 +312,7 @@ static void dag_add_driver_relation(AnimData *adt, DagForest *dag, DagNode *node for (fcu = adt->drivers.first; fcu; fcu = fcu->next) { ChannelDriver *driver = fcu->driver; DriverVar *dvar; - int isdata_fcu = isdata || (fcu->rna_path && strstr(fcu->rna_path, "modifiers[")); + int isdata_fcu = (isdata) || (fcu->rna_path && strstr(fcu->rna_path, "modifiers[")); /* loop over variables to get the target relationships */ for (dvar = driver->variables.first; dvar; dvar = dvar->next) { @@ -379,6 +380,10 @@ static void dag_add_material_driver_relations(DagForest *dag, DagNode *node, Mat dag_add_driver_relation(ma->adt, dag, node, 1); } + /* textures */ + // TODO... + //dag_add_texture_driver_relations(DagForest *dag, DagNode *node, ID *id); + /* material's nodetree */ if (ma->nodetree) { dag_add_material_nodetree_driver_relations(dag, node, ma->nodetree); |