diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-01-16 02:09:52 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-01-16 02:09:52 +0300 |
| commit | c7a122aa27662a2fb528663ddd3dd652cdda2010 (patch) | |
| tree | a014a8601c20ccd4d48dd82e9b0f88245b4beddd /source/blender/makesrna/intern/rna_main_api.c | |
| parent | bc1e26e4965877533902aa5d0e51537deeb319c4 (diff) | |
| parent | 86bbab7de53b07ad9a45b11dbff6bd5c0ee40c14 (diff) | |
Merged changes in the trunk up to revision 34335.
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 91220852e6d..8fb23e371d1 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -237,9 +237,10 @@ void rna_Main_meshes_remove(Main *bmain, ReportList *reports, Mesh *mesh) /* XXX python now has invalid pointer? */ } -Lamp *rna_Main_lamps_new(Main *bmain, const char *name) +Lamp *rna_Main_lamps_new(Main *bmain, const char *name, int type) { Lamp *lamp= add_lamp(name); + lamp->type= type; id_us_min(&lamp->id); return lamp; } @@ -734,6 +735,8 @@ void RNA_def_main_lamps(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_ui_description(func, "Add a new lamp to the main database"); parm= RNA_def_string(func, "name", "Lamp", 0, "", "New name for the datablock."); RNA_def_property_flag(parm, PROP_REQUIRED); + parm= RNA_def_enum(func, "type", lamp_type_items, 0, "Type", "The type of texture to add"); + RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ parm= RNA_def_pointer(func, "lamp", "Lamp", "", "New lamp datablock."); RNA_def_function_return(func, parm); @@ -808,9 +811,11 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop) parm= RNA_def_string(func, "name", "Image", 0, "", "New name for the datablock."); RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_int(func, "width", 1024, 1, INT_MAX, "", "Width of the image.", 0, INT_MAX); + RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_int(func, "height", 1024, 1, INT_MAX, "", "Height of the image.", 0, INT_MAX); - parm= RNA_def_boolean(func, "alpha", 0, "Alpha", "Use alpha channel"); - parm= RNA_def_boolean(func, "float_buffer", 0, "Float Buffer", "Create an image with floating point color"); + RNA_def_property_flag(parm, PROP_REQUIRED); + RNA_def_boolean(func, "alpha", 0, "Alpha", "Use alpha channel"); + RNA_def_boolean(func, "float_buffer", 0, "Float Buffer", "Create an image with floating point color"); /* return type */ parm= RNA_def_pointer(func, "image", "Image", "", "New image datablock."); RNA_def_function_return(func, parm); |