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:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-06-19 15:49:36 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-06-19 15:49:36 +0300
commit16d09a5864069c3d84988ba300a4785457a531ab (patch)
treee58dc147d4fa8db0d6b672a2abbb640698d0d714 /source/blender/compositor
parent28d77f9354de9c916921b36be4edc433b86fe29d (diff)
Fix T67358: Compositor Disabled Node Config -> SegFault
The issue was caused by wrong conversion happening after some of the proxies are removed. Easiest solution is to first remove proxies and then add required converter operations. Thanks Jeroen for the review!
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_NodeOperationBuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 5ce6ca34b34..53a6d115e97 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -98,10 +98,10 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
add_operation_input_constants();
- add_datatype_conversions();
-
resolve_proxies();
+ add_datatype_conversions();
+
determineResolutions();
/* surround complex ops with read/write buffer */