Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-03-27 15:25:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-03-27 16:23:32 +0300
commit8af5390968a1c6971ba2e8b4f7621d4b8344fce8 (patch)
treeb9ca837ab50e91ea21a205389741422c257f7299 /source/blender/compositor/intern
parent3366b30bf1fbd8a70cb3413186db747a494e130b (diff)
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.
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r--source/blender/compositor/intern/COM_NodeOperationBuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index aed60f5fca8..e899b7b14fd 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 */