diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-03 18:53:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-03 18:53:54 +0400 |
| commit | 0cf0f5a62225f9f9cc2ed9715274e94dc09ad8b0 (patch) | |
| tree | f89e9ebe84dc32179532ab8fc269c46b8b6e8b8a /source/blender/makesrna/intern/rna_internal.h | |
| parent | 52cefa4bc1104231cf6c6ef5b12124df135e2914 (diff) | |
rna api
- move: material.add_texture(tex, coords, mapto) --> material.texture_slots.add()
- added material.texture_slots.create(index), material.texture_slots.clear(index)
- texture slot functions also work for lamp and world now.
Other minor changes
- allow rna functions to set FUNC_NO_SELF and FUNC_USE_SELF_ID at once.
- [#23317] Changed some operators' RNA to accept lengths, a modification I made to this patch made it not work as intended, removed this edit so unit buttons appier in the UI for certain operators.
- Sphinx doc gen, 2 columns rather then 3, didnt quite fit in some cases.
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 669fc5d3871..401f9de92d4 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -182,7 +182,7 @@ void rna_def_animviz_common(struct StructRNA *srna); void rna_def_motionpath_common(struct StructRNA *srna); void rna_def_texmat_common(struct StructRNA *srna, const char *texspace_editable); -void rna_def_mtex_common(struct StructRNA *srna, const char *begin, const char *activeget, const char *activeset, const char *structname, const char *update); +void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna, const char *begin, const char *activeget, const char *activeset, const char *structname, const char *structname_slots, const char *update); void rna_def_render_layer_common(struct StructRNA *srna, int scene); void rna_ID_name_get(struct PointerRNA *ptr, char *value); @@ -352,6 +352,10 @@ PointerRNA rna_pointer_inherit_refine(struct PointerRNA *ptr, struct StructRNA * int rna_parameter_size(struct PropertyRNA *parm); int rna_parameter_size_alloc(struct PropertyRNA *parm); +// XXX, these should not need to be defined here~! +struct MTex *rna_mtex_texture_slots_add(struct ID *self, struct ReportList *reports); +struct MTex *rna_mtex_texture_slots_create(struct ID *self, struct ReportList *reports, int index); +void rna_mtex_texture_slots_clear(struct ID *self, struct ReportList *reports, int index); #endif /* RNA_INTERNAL_H */ |