[Bf-blender-cvs] [c69b5e0] master: Fix T44040: Blender crashes when nodes are muted

[Sergey Sharybin]

Commit: c69b5e027642a3f82f869062e79ee532bec1b723
Author: Sergey Sharybin
Date:   Thu Mar 19 16:04:49 2015 +0500
Branches: master
https://developer.blender.org/rBc69b5e027642a3f82f869062e79ee532bec1b723

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.

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

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 74c05c3..45105ba 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 */