From 16d09a5864069c3d84988ba300a4785457a531ab Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 19 Jun 2020 14:49:36 +0200 Subject: 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! --- source/blender/compositor/intern/COM_NodeOperationBuilder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/compositor/intern') 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 */ -- cgit v1.2.3