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 /intern/cycles/blender/blender_util.h | |
| parent | 3b487a6944892204afbdc920ac839a266f54aff5 (diff) | |
fix for incorrect declaration rna_Object_free_duplilist() in cycles.
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index d0fca9a9fb9..46fbead9bc1 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -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) |