diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /source/blender/makesrna/intern/rna_internal.h | |
parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
-rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index a4582406c10..b85688e156c 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -34,8 +34,14 @@ #define RNA_MAGIC ((int)~0) +struct ColorBand; struct ID; struct IDProperty; +struct Main; +struct Mesh; +struct Object; +struct RenderEngine; +struct ReportList; struct SDNA; struct Sequence; @@ -400,6 +406,22 @@ void rna_mtex_texture_slots_clear(struct ID *self, struct bContext *C, struct Re int rna_IDMaterials_assign_int(struct PointerRNA *ptr, int key, const struct PointerRNA *assign_ptr); + +/* Internal functions that cycles uses so we need to declare (tsk tsk) */ +struct Mesh *rna_Object_to_mesh(struct Object *ob, struct ReportList *reports, struct Scene *sce, int apply_modifiers, int settings); +void rna_Main_meshes_remove(struct Main *bmain, struct ReportList *reports, struct Mesh *mesh); +void rna_Object_create_duplilist(struct Object *ob, struct ReportList *reports, struct Scene *sce); +void rna_Object_free_duplilist(struct Object *ob); +void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values); +void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values); +int rna_Object_is_modified(struct Object *ob, struct Scene *scene, int settings); +int rna_Object_is_deform_modified(struct Object *ob, struct Scene *scene, int settings); +void rna_ColorRamp_eval(struct ColorBand *coba, float position, float color[4]); +void rna_Scene_frame_set(struct Scene *scene, int frame, float subframe); + +void engine_tag_redraw(struct RenderEngine *engine); +void engine_tag_update(struct RenderEngine *engine); + #endif /* __RNA_INTERNAL_H__ */ |