griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for incorrect declaration rna_Object_free_duplilist() in cycles.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-23 05:02:06 +00:00
parent 3b487a6944
commit 3e6340214d
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_util.h
View File

@@ -37,7 +37,7 @@ struct RenderResult;
ID *rna_Object_to_mesh(void *_self, void *reports, void *scene, int apply_modifiers, int settings);
void rna_Main_meshes_remove(void *bmain, void *reports, void *mesh);
void rna_Object_create_duplilist(void *ob, void *reports, void *sce);
void rna_Object_free_duplilist(void *ob, void *reports);
void rna_Object_free_duplilist(void *ob);
void rna_RenderLayer_rect_set(PointerRNA *ptr, const float *values);
void rna_RenderPass_rect_set(PointerRNA *ptr, const float *values);
struct RenderResult *RE_engine_begin_result(struct RenderEngine *engine, int x, int y, int w, int h, const char *layername);
@@ -89,7 +89,7 @@ static inline void object_create_duplilist(BL::Object self, BL::Scene scene)
static inline void object_free_duplilist(BL::Object self)
{
rna_Object_free_duplilist(self.ptr.data, NULL);
rna_Object_free_duplilist(self.ptr.data);
}
static inline bool BKE_object_is_modified(BL::Object self, BL::Scene scene, bool preview)

2
source/blender/makesrna/intern/rna_animation.c
View File

@@ -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;

22
source/blender/makesrna/intern/rna_internal.h
View File

@@ -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__ */