Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(103)

Issue 6199059: File output and image node improvements for arbitrary layer access

Can't Edit
Can't Publish+Mail
Start Review
Created:
12 years ago by lukas.toenne
Modified:
12 years ago
Reviewers:
bf-codereview, brechtvl
Base URL:
https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Visibility:
Public.

Description

A couple more changes to the file and image nodes to improve access to layers that don't follow Blender's rlayer.rpass naming scheme. --- Changes to File Output node --- * Flat layer names in EXR multilayer files. For a socket with name "AAA" the previous resulting EXR layer name would be "AAA.AAA", i.e. the render layer as well as render pass would use the socket name. Now the "render_layer.render_pass" scheme is ignored in multilayer files, socket names are directly written to EXR layers (EXR layer name is "AAA" in this example). If sockets should have a notion of "render layer" this can still be achieved by explicitly adding a separator, e.g. "AAA.BBB". When loading such layers into a Blender Image struct, the name is interpreted as a "render_layer.render_pass" again (although the image node does not care about it, see below). * Socket sub-paths (for singlelayer) or layer names (for multilayer) are stored in dedicated string variables in the socket storage data. This way the RNA can define precise string subtypes (PROP_FILEPATH) and length. The file/layer slots are defined as separate structs with own name properties in the RNA as well, so they can be used nicely with the list template. * Ensure unique socket paths/layer names to prevent overwriting of files and layers respectively. --- Changes to Image node --- * Loading multilayer OpenEXR files has improved layer name splitting into render layer + render pass names now. This properly supports arbitrary EXR layer names now. Example: OpenEXR layer name: AAA.BBB.CCC is split into Render layer name: AAA.BBB Render pass name: CCC If the layer name has no '.' separators the render layer name is empty. * Image node ignores the selected render layer in the image user data. Instead all existing layers are displayed at the same time by combining the render layer names with render pass names again, to reconstruct the original EXR layer name. This avoids the problem that render layers with empty name are not selectetable in the dropdown and allows using all image layers at the same time without duplicating the node.

Patch Set 1 #

Total comments: 4

Patch Set 2 : Removed exr_ prefix from layer #

Unified diffs Side-by-side diffs Delta from patch set Stats (+442 lines, -165 lines) Patch
source/blender/blenkernel/BKE_blender.h View 1 1 chunk +1 line, -1 line 0 comments Download
source/blender/blenkernel/BKE_node.h View 1 1 chunk +5 lines, -0 lines 0 comments Download
source/blender/blenloader/intern/readfile.c View 1 2 chunks +66 lines, -0 lines 0 comments Download
source/blender/blenloader/intern/writefile.c View 1 1 chunk +5 lines, -0 lines 0 comments Download
source/blender/editors/space_node/drawnode.c View 1 4 chunks +41 lines, -25 lines 0 comments Download
source/blender/imbuf/intern/openexr/openexr_api.cpp View 1 1 chunk +38 lines, -24 lines 0 comments Download
source/blender/makesdna/DNA_node_types.h View 1 2 chunks +15 lines, -2 lines 0 comments Download
source/blender/makesrna/RNA_access.h View 1 1 chunk +2 lines, -2 lines 0 comments Download
source/blender/makesrna/intern/rna_nodetree.c View 1 8 chunks +94 lines, -54 lines 0 comments Download
source/blender/nodes/composite/nodes/node_composite_image.c View 1 9 chunks +87 lines, -42 lines 0 comments Download
source/blender/nodes/composite/nodes/node_composite_outputFile.c View 1 5 chunks +88 lines, -15 lines 0 comments Download

Messages

Total messages: 4
lukas.toenne
12 years ago (2012-05-10 09:00:04 UTC) #1
brechtvl
Except for two nitpicks, LGTM. http://codereview.appspot.com/6199059/diff/1/source/blender/imbuf/intern/openexr/openexr_api.cpp File source/blender/imbuf/intern/openexr/openexr_api.cpp (right): http://codereview.appspot.com/6199059/diff/1/source/blender/imbuf/intern/openexr/openexr_api.cpp#newcode730 source/blender/imbuf/intern/openexr/openexr_api.cpp:730: *token = end-len; Seems ...
12 years ago (2012-05-10 12:01:23 UTC) #2
lukas.toenne
http://codereview.appspot.com/6199059/diff/1/source/blender/imbuf/intern/openexr/openexr_api.cpp File source/blender/imbuf/intern/openexr/openexr_api.cpp (right): http://codereview.appspot.com/6199059/diff/1/source/blender/imbuf/intern/openexr/openexr_api.cpp#newcode730 source/blender/imbuf/intern/openexr/openexr_api.cpp:730: *token = end-len; On 2012/05/10 12:01:23, brechtvl wrote: > ...
12 years ago (2012-05-10 13:29:05 UTC) #3
lukas.toenne
12 years ago (2012-05-10 13:30:01 UTC) #4
Removed exr_ prefix from layer
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b