diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-19 14:04:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-19 14:04:49 +0300 |
| commit | c69b5e027642a3f82f869062e79ee532bec1b723 (patch) | |
| tree | 0e8f3ab5dff4887aa81e4ab7d4f6f3790d0a4d5a /source/blender/compositor/intern | |
| parent | 52d72a37cd85dc8c23482d4102abb86645a221bb (diff) | |
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.
Diffstat (limited to 'source/blender/compositor/intern')
| -rw-r--r-- | source/blender/compositor/intern/COM_NodeOperationBuilder.cpp | 4 |
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 74c05c3e62e..45105bade08 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 */ |