diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-08-17 16:54:05 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-08-18 18:00:45 +0300 |
| commit | e8f0ee157b290e41258bf704d63c00cb2d4d2a90 (patch) | |
| tree | a3a01967ef754061897d5fd77bc51015d627ddb0 /source/blender/blenloader | |
| parent | 8ab6e8aad623a08c25c45e6dfd91804b1be09ae6 (diff) | |
Swap Eevee material output with (Cycles) Material Output
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.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 1c7ecc9ce3b..ce452d58565 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -446,10 +446,17 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) error = true; } - if (node->type == SH_NODE_EEVEE_SPECULAR && STREQ(node->idname, "ShaderNodeOutputSpecular")) { + else if (node->type == SH_NODE_EEVEE_SPECULAR && STREQ(node->idname, "ShaderNodeOutputSpecular")) { BLI_strncpy(node->idname, "ShaderNodeEeveeSpecular", sizeof(node->idname)); error = true; } + + else if (node->type == 196 /* SH_NODE_OUTPUT_EEVEE_MATERIAL */ && + STREQ(node->idname, "ShaderNodeOutputEeveeMaterial")) + { + node->type = SH_NODE_OUTPUT_MATERIAL; + BLI_strncpy(node->idname, "ShaderNodeOutputMaterial", sizeof(node->idname)); + } } } } FOREACH_NODETREE_END |