From c69b5e027642a3f82f869062e79ee532bec1b723 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 19 Mar 2015 16:04:49 +0500 Subject: Fix T44040: Blender crashes when nodes are muted It was actually an old issue with wrong conversion happening for muted nodes, which wasn't visible before memory optimization commit. This is to be backported to the final release. --- 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 74c05c3e62e..45105bade08 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp @@ -101,12 +101,12 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system) } } + resolve_proxies(); + add_datatype_conversions(); add_operation_input_constants(); - resolve_proxies(); - determineResolutions(); /* surround complex ops with read/write buffer */ -- cgit v1.2.3