diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-07 17:21:04 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-07 17:21:04 +0400 |
commit | ec26abd2db934099bb2cc28510cf255775ae4ab1 (patch) | |
tree | ba77db5750dcefde5add1493605535b665fa9c0c /source/blender/makesrna/intern/rna_render.c | |
parent | 8318acd1299a44e0b8fd80522993e5367ef2cf07 (diff) | |
parent | a02d7c1ba76adbf3ff432111af4c3c81a0812c3a (diff) |
Cycles: svn merge -r37957:39132 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesrna/intern/rna_render.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 20ae9cae5f6..a0744a5b6a0 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -494,6 +494,7 @@ static void rna_def_render_pass(BlenderRNA *brna) {SCE_PASS_MIST, "MIST", 0, "Mist", ""}, {SCE_PASS_EMIT, "EMIT", 0, "Emit", ""}, {SCE_PASS_ENVIRONMENT, "ENVIRONMENT", 0, "Environment", ""}, + {SCE_PASS_INDEXMA, "MATERIAL_INDEX", 0, "Material Index", ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "RenderPass", NULL); |