[Bf-blender-cvs] [8af5390] master: Fix T44149: Compositing : Node Groups do not work correctly
Sergey Sharybin
noreply at git.blender.org
Fri Mar 27 14:24:15 CET 2015
Commit: 8af5390968a1c6971ba2e8b4f7621d4b8344fce8
Author: Sergey Sharybin
Date: Fri Mar 27 17:25:12 2015 +0500
Branches: master
https://developer.blender.org/rB8af5390968a1c6971ba2e8b4f7621d4b8344fce8
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 aed60f5..e899b7b 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 */
More information about the Bf-blender-cvs
mailing list