[Bf-blender-cvs] [16d09a58640] master: Fix T67358: Compositor Disabled Node Config -> SegFault

[Sergey Sharybin]

Commit: 16d09a5864069c3d84988ba300a4785457a531ab
Author: Sergey Sharybin
Date:   Fri Jun 19 14:49:36 2020 +0200
Branches: master
https://developer.blender.org/rB16d09a5864069c3d84988ba300a4785457a531ab

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 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 */