[Bf-blender-cvs] [6410b1b] blender-v2.74-release: Fix T44149: Compositing : Node Groups do not work correctly

[Sergey Sharybin]

Commit: 6410b1bd59d8cf54ee619ffef8f8b14d0109b565
Author: Sergey Sharybin
Date:   Fri Mar 27 17:25:12 2015 +0500
Branches: blender-v2.74-release
https://developer.blender.org/rB6410b1bd59d8cf54ee619ffef8f8b14d0109b565

Fix T44149: Compositing : Node Groups do not work correctly

Input constants are to be connected before removing proxies,
otherwise node groups might give totally different result.

This is a regression and to be put into 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 45105ba..ab84156 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)
 		}
 	}
 	
+	add_operation_input_constants();
+	
 	resolve_proxies();
 	
 	add_datatype_conversions();
 	
-	add_operation_input_constants();
-	
 	determineResolutions();
 	
 	/* surround complex ops with read/write buffer */