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:
authorBrecht Van Lommel <brecht@blender.org>2021-03-15 18:11:12 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-03-15 18:47:07 +0300
commitcd3fade2aaf74d1c3db345c13bd0122dc45d372f (patch)
treea87fb96829eecd8c7f138539ef26a196b1ab947a /intern/cycles/render/film.cpp
parent3fdef12162f68a7f89a6f868f927fe8755c7bd20 (diff)
Fix Cycles rendering crash on OpenBSD
Static initialization order was not guaranteed to be correct for node base types. Now wrap all initialization in accessor functions to ensure the order is correct. Did not cause any known bug on Linux/macOS/Windows, but showed up on this platform.
Diffstat (limited to 'intern/cycles/render/film.cpp')
-rw-r--r--intern/cycles/render/film.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 9b7657802d6..c4ff89fc838 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -96,7 +96,7 @@ NODE_DEFINE(Pass)
return type;
}
-Pass::Pass() : Node(node_type)
+Pass::Pass() : Node(get_node_type())
{
}
@@ -407,7 +407,7 @@ NODE_DEFINE(Film)
return type;
}
-Film::Film() : Node(node_type)
+Film::Film() : Node(get_node_type())
{
use_light_visibility = false;
filter_table_offset = TABLE_OFFSET_INVALID;