Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-11-10 11:30:36 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-11-10 14:45:41 +0300
commitaa2f6e59770896a981831c432667bbf58e232ce2 (patch)
treeff8c84b421fb1c788117bdfbd65f0ee01b71b105
parentbec72a43aef0d0f4553f193be6d67df001dfe3b7 (diff)
Fix T92979: Emission Strength Animation read wrong in 3.0
First this was wrong for files written in 2.93 read into blender in 3.0 after the CyclesX merge. Then this was fixed by versioning in rB6321dd3d4007. But this caused files written in 3.0 to have this versioning applied as well (leading to socket shifting). Now only do the versioning for files created before the CyclesX merge. Maniphest Tasks: T92979 Differential Revision: https://developer.blender.org/D13173
-rw-r--r--source/blender/blenloader/intern/versioning_300.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 47d919c151f..6d44017157c 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -645,6 +645,10 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports))
}
}
+ if (!MAIN_VERSION_ATLEAST(bmain, 300, 25)) {
+ version_node_socket_index_animdata(bmain, NTREE_SHADER, SH_NODE_BSDF_PRINCIPLED, 4, 2, 25);
+ }
+
if (!MAIN_VERSION_ATLEAST(bmain, 300, 26)) {
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
ToolSettings *tool_settings = scene->toolsettings;
@@ -780,7 +784,6 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports))
{
/* Keep this block, even when empty. */
- version_node_socket_index_animdata(bmain, NTREE_SHADER, SH_NODE_BSDF_PRINCIPLED, 4, 2, 25);
}
}