diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-04 15:42:44 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-04 15:42:44 +0400 |
| commit | e8bb972f3c04b00f6e813b61332c53213c12e8c4 (patch) | |
| tree | 5d05e7c8421c5af4e034ff3a01ebe34a2d94b9ec /source/blender/makesrna/intern/rna_internal.h | |
| parent | 9e9b26b8ba54227f79f97acc87893611d61b9831 (diff) | |
| parent | 019dca9c54289136b34c688a048ee009e2e852ee (diff) | |
Merge with trunk r40782
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 3f8502e3ede..9e8e3e252c5 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -235,6 +235,7 @@ char *rna_TextureSlot_path(struct PointerRNA *ptr); void RNA_api_action(StructRNA *srna); void RNA_api_armature_edit_bone(StructRNA *srna); void RNA_api_bone(StructRNA *srna); +void RNA_api_camera(StructRNA *srna); void RNA_api_drivers(StructRNA *srna); void RNA_api_image(struct StructRNA *srna); void RNA_api_operator(struct StructRNA *srna); @@ -382,6 +383,9 @@ struct MTex *rna_mtex_texture_slots_add(struct ID *self, struct bContext *C, str struct MTex *rna_mtex_texture_slots_create(struct ID *self, struct bContext *C, struct ReportList *reports, int index); void rna_mtex_texture_slots_clear(struct ID *self, struct bContext *C, struct ReportList *reports, int index); + +int rna_IDMaterials_assign_int(struct PointerRNA *ptr, int key, const struct PointerRNA *assign_ptr); + #endif /* RNA_INTERNAL_H */ |