diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-08-02 00:18:02 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-08-02 00:18:02 +0400 |
| commit | 9a0b816416595d7677a1f7ad4f7ac3668e56eb22 (patch) | |
| tree | 5f0cbea93b4a5bb807acabc7ccf85327ef537182 /source/blender/makesrna/intern/rna_ID.c | |
| parent | 46db54c8059aa86cef25c7ceddb1c104585614fc (diff) | |
| parent | c965d1d2ccfd57926476cb5c091afa35c6de217f (diff) | |
Merged changes in the trunk up to revision 38893.
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 05c94a834de..c6b4fd09bca 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -35,6 +35,7 @@ #include "DNA_ID.h" #include "DNA_vfont_types.h" +#include "DNA_material_types.h" #include "DNA_object_types.h" #include "WM_types.h" @@ -419,8 +420,9 @@ static void rna_def_ID_materials(BlenderRNA *brna) func= RNA_def_function(srna, "pop", "material_pop_id"); RNA_def_function_ui_description(func, "Remove a material from the data block."); - parm= RNA_def_int(func, "index", 0, 0, INT_MAX, "", "Index of material to remove.", 0, INT_MAX); + parm= RNA_def_int(func, "index", 0, 0, MAXMAT, "", "Index of material to remove.", 0, MAXMAT); RNA_def_property_flag(parm, PROP_REQUIRED); + RNA_def_boolean(func, "update_data", 0, "", "Update data by re-adjusting the material slots assigned."); parm= RNA_def_pointer(func, "material", "Material", "", "Material to remove."); RNA_def_function_return(func, parm); } |