[Bf-blender-cvs] [020b8e2c73e] blender-v2.83-release: Fix T67358: Compositor Disabled Node Config -> SegFault

[Sergey Sharybin]

Commit: 020b8e2c73e6d7d05ccdd8f1ed0a22686bb12658
Author: Sergey Sharybin
Date:   Fri Jun 19 14:49:36 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB020b8e2c73e6d7d05ccdd8f1ed0a22686bb12658

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!

===================================================================

M	source/blender/compositor/intern/COM_NodeOperationBuilder.cpp

===================================================================

diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 9f6b91915e0..bd1c945ed85 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -100,10 +100,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 */