diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-23 09:02:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-23 09:02:06 +0400 |
commit | 3e6340214d55650ac1560ca16e7e3a239ae889b2 (patch) | |
tree | a4cbe08897ffa70627e94d792f329ca2c741707d /source/blender/makesrna | |
parent | 3b487a6944892204afbdc920ac839a266f54aff5 (diff) |
fix for incorrect declaration rna_Object_free_duplilist() in cycles.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 69f785c32de..d50cb663b97 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -829,7 +829,7 @@ void rna_def_animdata_common(StructRNA *srna) RNA_def_property_ui_text(prop, "Animation Data", "Animation data for this datablock"); } -void rna_def_animdata(BlenderRNA *brna) +static void rna_def_animdata(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index e8e40d307fb..c8b25b7b697 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; @@ -398,6 +404,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__ */ |