bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Revert "Depsgraph: Link from material to object shading"

Browse Source 
The change was initially needed for Blender 2.8 branch but the actual
function was reverted in there. So no reason to keep dead unused
placeholder in the dependency graph.

This reverts commit fd69ba225540cde5e4c1fa651fb02df21ea0a143.
This commit is contained in:
Sergey Sharybin 2017-05-02 15:31:49 +02:00
parent 4384a7cf46
commit 143d7ad40f
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -854,18 +854,11 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
}
/* materials */
if (ob->totcol != 0) {
for (int a = 1; a <= ob->totcol; a++) {
Material *ma = give_current_material(ob, a);
if (ma != NULL) {
build_material(ma);
}
for (int a = 1; a <= ob->totcol; a++) {
Material *ma = give_current_material(ob, a);
if (ma != NULL) {
build_material(ma);
}
add_operation_node(&ob->id,
DEPSNODE_TYPE_SHADING,
DEPSOP_TYPE_EXEC,
NULL,
DEG_OPCODE_PLACEHOLDER, "Material Update");
}
/* geometry collision */

9
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -1489,18 +1489,11 @@ void DepsgraphRelationBuilder::build_obdata_geom(Main *bmain, Scene *scene, Obje
}
/* materials */
if (ob->totcol != 0) {
ComponentKey object_shading_key(&ob->id, DEPSNODE_TYPE_SHADING);
if (ob->totcol) {
for (int a = 1; a <= ob->totcol; a++) {
Material *ma = give_current_material(ob, a);
if (ma != NULL) {
build_material(ma);
ComponentKey material_shading_key(&ma->id,
DEPSNODE_TYPE_SHADING);
add_relation(material_shading_key,
object_shading_key,
DEPSREL_TYPE_UPDATE,
"Object Shading");
}
}
}