diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-12-28 12:26:45 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-12-28 13:32:33 +0300 |
| commit | c07ae0e821e441b3c3a9b6f192487744c54f4015 (patch) | |
| tree | 2a4665adc741aa9f9165ca34ce5276f763383bc2 /source/blender/nodes | |
| parent | 1e935b090be3287f835d6bcbacc6b2c5345f3936 (diff) | |
Fix T59922: crash reading files with older renderlayers
- own error in rB2c196de56bbb163048b08f321983234a5e72e804
- now introduce RE_PASSNAME_DEPRECATED placeholder for old passes
- also dont allocate NodeImageLayers for these
Reviewers: brecht
Maniphest Tasks: T59922
Differential Revision: https://developer.blender.org/D4132
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 8d400ada0c7..6cb7704d1a7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -354,7 +354,9 @@ const char *node_cmp_rlayers_sock_to_pass(int sock_index) { const char *sock_to_passname[] = { RE_PASSNAME_COMBINED, RE_PASSNAME_COMBINED, - RE_PASSNAME_Z, RE_PASSNAME_NORMAL, RE_PASSNAME_UV, RE_PASSNAME_VECTOR, RE_PASSNAME_SHADOW, RE_PASSNAME_AO, + RE_PASSNAME_Z, RE_PASSNAME_NORMAL, RE_PASSNAME_UV, RE_PASSNAME_VECTOR, RE_PASSNAME_DEPRECATED, + RE_PASSNAME_DEPRECATED, RE_PASSNAME_DEPRECATED, RE_PASSNAME_SHADOW, RE_PASSNAME_AO, + RE_PASSNAME_DEPRECATED, RE_PASSNAME_DEPRECATED, RE_PASSNAME_DEPRECATED, RE_PASSNAME_INDEXOB, RE_PASSNAME_INDEXMA, RE_PASSNAME_MIST, RE_PASSNAME_EMIT, RE_PASSNAME_ENVIRONMENT, RE_PASSNAME_DIFFUSE_DIRECT, RE_PASSNAME_DIFFUSE_INDIRECT, RE_PASSNAME_DIFFUSE_COLOR, RE_PASSNAME_GLOSSY_DIRECT, RE_PASSNAME_GLOSSY_INDIRECT, RE_PASSNAME_GLOSSY_COLOR, |