archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Swap Eevee material output with (Cycles) Material Output

Browse Source 
Since we started supporting the (Cycles) Material Output old files
stopped working. There is no reason to keep the original Eevee material
otuput anymore.

It includes doversion for old files.
This commit is contained in:
Dalai Felinto
2017-08-17 15:54:05 +02:00
parent 8ab6e8aad6
commit e8f0ee157b
10 changed files with 11 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/blender/blender_shader.cpp
View File

@@ -947,7 +947,6 @@ static BL::ShaderNode find_output_node(BL::ShaderNodeTree& b_ntree)
{
BL::ShaderNodeTree::nodes_iterator b_node;
BL::ShaderNode output_node(PointerRNA_NULL);
BL::ShaderNode eevee_output_node(PointerRNA_NULL);
for(b_ntree.nodes.begin(b_node); b_node != b_ntree.nodes.end(); ++b_node) {
BL::ShaderNodeOutputMaterial b_output_node(*b_node);
@@ -964,19 +963,9 @@ static BL::ShaderNode find_output_node(BL::ShaderNodeTree& b_ntree)
output_node = b_output_node;
}
}
else if (b_output_node.is_a(&RNA_ShaderNodeOutputEeveeMaterial)) {
/* Eevee output used if no Cycles node exists */
if(b_output_node.is_active_output()) {
eevee_output_node = b_output_node;
}
else if(!eevee_output_node.ptr.data) {
eevee_output_node = b_output_node;
}
}
}
return (output_node.ptr.data) ? output_node : eevee_output_node;
return output_node;
}
static void add_nodes(Scene *scene,