Skip to content
Snippets Groups Projects
Commit eb9826d8 authored by Antony Riakiotakis's avatar Antony Riakiotakis Committed by Sergey Sharybin
Browse files

Versioning code to correct socket naming after

340b76b4

Reported by formerly Old_Demon on blenderartists.

Apparently this caused old files to lose their links to material sockets
(noob own mistake from inexperience with node system).

This should either be included in release with version checking being
set to version 2.73 and subversion 10, without tweaking the
BKE_blender.h file

OR

340b76b4 should be reverted for this
release.

Thanks to Lukas for checking this out.

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/blenloader/intern/versioning_270.c
parent c7dc142c
Branches
Tags
No related merge requests found
......@@ -643,4 +643,32 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
}
}
if (!MAIN_VERSION_ATLEAST(main, 274, 3)) {
FOREACH_NODETREE(main, ntree, id)
{
bNode *node;
bNodeSocket *sock;
for (node = ntree->nodes.first; node; node = node->next) {
if (node->type == SH_NODE_MATERIAL) {
for (sock = node->inputs.first; sock; sock = sock->next) {
if (STREQ(sock->name, "Refl")) {
BLI_strncpy(sock->name, "DiffuseIntensity", sizeof(sock->name));
}
}
}
else if (node->type == SH_NODE_MATERIAL_EXT) {
for (sock = node->outputs.first; sock; sock = sock->next) {
if (STREQ(sock->name, "Refl")) {
BLI_strncpy(sock->name, "DiffuseIntensity", sizeof(sock->name));
}
else if (STREQ(sock->name, "Ray Mirror")) {
BLI_strncpy(sock->name, "Reflectivity", sizeof(sock->name));
}
}
}
}
}
FOREACH_NODETREE_END
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment