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:
authorTon Roosendaal <ton@blender.org>2010-11-12 17:59:01 +0300
committerTon Roosendaal <ton@blender.org>2010-11-12 17:59:01 +0300
commit0b23f03503e6acb5261711720950fde410bb534d (patch)
tree374f43634168e7e79cb1867ea25d914a9e53a14b /source/blender/makesrna/intern/rna_nodetree_types.h
parent3c4b1c0d60e1391bbcd95fb0e7f6d179cc1a33da (diff)
Bugfix #24335
ZCombine node in compositor ignored alpha values. Enabling it would break compatibility though, so it's a tickbox option now. Patch provided by reporter, Martin Lubich. Thanks!
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree_types.h')
-rw-r--r--source/blender/makesrna/intern/rna_nodetree_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h
index f824f6f20ce..679a5fc0cdc 100644
--- a/source/blender/makesrna/intern/rna_nodetree_types.h
+++ b/source/blender/makesrna/intern/rna_nodetree_types.h
@@ -71,7 +71,7 @@ DefNode( CompositorNode, CMP_NODE_COMPOSITE, 0, "COMPO
DefNode( CompositorNode, CMP_NODE_OUTPUT_FILE, def_cmp_output_file, "OUTPUT_FILE", OutputFile, "Output File", "" )
DefNode( CompositorNode, CMP_NODE_TEXTURE, def_texture, "TEXTURE", Texture, "Texture", "" )
DefNode( CompositorNode, CMP_NODE_TRANSLATE, 0, "TRANSLATE", Translate, "Translate", "" )
-DefNode( CompositorNode, CMP_NODE_ZCOMBINE, 0, "ZCOMBINE", Zcombine, "Z Combine", "" )
+DefNode( CompositorNode, CMP_NODE_ZCOMBINE, def_cmp_zcombine, "ZCOMBINE", Zcombine, "Z Combine", "" )
DefNode( CompositorNode, CMP_NODE_COMBRGBA, 0, "COMBRGBA", CombRGBA, "Combine RGBA", "" )
DefNode( CompositorNode, CMP_NODE_DILATEERODE, def_cmp_dilate_erode, "DILATEERODE", DilateErode, "Dilate/Erode", "" )
DefNode( CompositorNode, CMP_NODE_ROTATE, def_cmp_rotate, "ROTATE", Rotate, "Rotate", "" )