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:
authorJeroen Bakker <j.bakker@atmind.nl>2019-05-24 15:08:21 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-06-18 12:10:41 +0300
commitf9e0d51e318e513fc4ce72c2acdfbded647b4a23 (patch)
tree296fd8c0a89d1a77a59289334a55b3b1c0509ccd /source/blender/compositor
parent5e768200c234bde37846ddcb6e77578c750b926b (diff)
Compositor: File output node sockets
When using RNA to alter the type of socket only the type was changed. the typeinfo was not updated. Internally the File Output Node used RNA to update the sockettype. making the socket invalid. When users save the file and reopened the typeinfo was used. Also the color of the node was determined via the typeinfo. Another thing that happened was that the socket conversion was ignored when empty node groups were present. The empty node groups were optimized away before the needed data conversion was determined. Reviewed By: brecht Differential Revision: https://developer.blender.org/D4938
Diffstat (limited to 'source/blender/compositor')
-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 2b17fc0e5f7..198385649da 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -100,10 +100,10 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
add_operation_input_constants();
- resolve_proxies();
-
add_datatype_conversions();
+ resolve_proxies();
+
determineResolutions();
/* surround complex ops with read/write buffer */