diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-08 22:25:01 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-08 22:25:01 +0400 |
| commit | 5728b11ef2bdcfe77c15c73944d95a56d6cf7fee (patch) | |
| tree | 51ec49532e12b6b8dee407ff060a203db3f22a19 /source/blender/makesrna/intern/rna_nodetree_types.h | |
| parent | 276701502a6a55be8e447a728914406150e7b7c0 (diff) | |
| parent | 73a47caa08e7f034819943e65136a588aa304496 (diff) | |
Merging r47612 through r47623 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree_types.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree_types.h b/source/blender/makesrna/intern/rna_nodetree_types.h index ba6e40d3254..62c3051727d 100644 --- a/source/blender/makesrna/intern/rna_nodetree_types.h +++ b/source/blender/makesrna/intern/rna_nodetree_types.h @@ -80,6 +80,7 @@ DefNode( ShaderNode, SH_NODE_NEW_GEOMETRY, 0, "NE DefNode( ShaderNode, SH_NODE_LIGHT_PATH, 0, "LIGHT_PATH", LightPath, "Light Path", "" ) DefNode( ShaderNode, SH_NODE_LIGHT_FALLOFF, 0, "LIGHT_FALLOFF", LightFalloff, "Light Falloff", "" ) DefNode( ShaderNode, SH_NODE_OBJECT_INFO, 0, "OBJECT_INFO", ObjectInfo, "Object Info", "" ) +DefNode( ShaderNode, SH_NODE_PARTICLE_INFO, 0, "PARTICLE_INFO", ParticleInfo, "Particle Info", "" ) DefNode( ShaderNode, SH_NODE_TEX_IMAGE, def_sh_tex_image, "TEX_IMAGE", TexImage, "Image Texture", "" ) DefNode( ShaderNode, SH_NODE_TEX_ENVIRONMENT, def_sh_tex_environment, "TEX_ENVIRONMENT", TexEnvironment, "Environment Texture","" ) DefNode( ShaderNode, SH_NODE_TEX_SKY, def_sh_tex_sky, "TEX_SKY", TexSky, "Sky Texture", "" ) |