From 7cc206ddca5fd240f87210d6dfb311c81ca4ac65 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 29 Feb 2012 15:00:37 +0000 Subject: Code Cleanup: remove non existing function declarations. added some missing functions too - which are not used yep but should be there for api completeness. * CDDM_set_mloop * CDDM_set_mpoly * BLI_mempool_count --- source/blender/blenkernel/BKE_DerivedMesh.h | 6 ------ source/blender/blenkernel/BKE_blender.h | 1 - source/blender/blenkernel/BKE_brush.h | 1 - source/blender/blenkernel/BKE_cloth.h | 6 ------ source/blender/blenkernel/BKE_collision.h | 6 ------ source/blender/blenkernel/BKE_customdata.h | 6 +----- source/blender/blenkernel/BKE_depsgraph.h | 3 --- source/blender/blenkernel/BKE_effect.h | 4 ---- source/blender/blenkernel/BKE_idprop.h | 1 - source/blender/blenkernel/BKE_image.h | 3 --- source/blender/blenkernel/BKE_library.h | 7 ++++--- source/blender/blenkernel/BKE_material.h | 5 ----- source/blender/blenkernel/BKE_mesh.h | 5 ----- source/blender/blenkernel/BKE_movieclip.h | 2 -- source/blender/blenkernel/BKE_node.h | 2 -- source/blender/blenkernel/BKE_object.h | 4 ---- source/blender/blenkernel/BKE_pointcache.h | 6 ------ source/blender/blenkernel/BKE_sequencer.h | 1 - source/blender/blenkernel/BKE_text.h | 4 ---- source/blender/blenkernel/depsgraph_private.h | 4 +--- source/blender/blenkernel/intern/CCGSubSurf.h | 2 -- source/blender/blenkernel/intern/cdderivedmesh.c | 20 ++++++++++++++++++++ 22 files changed, 26 insertions(+), 73 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index b5b9e141ef8..3103dde31dc 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -613,7 +613,6 @@ DerivedMesh *mesh_create_derived_no_virtual(struct Scene *scene, struct Object * DerivedMesh *mesh_create_derived_physics(struct Scene *scene, struct Object *ob, float (*vertCos)[3], CustomDataMask dataMask); -DerivedMesh *editbmesh_get_derived(struct BMEditMesh *em, float (*vertexCos)[3]); DerivedMesh *editbmesh_get_derived_base(struct Object *, struct BMEditMesh *em); DerivedMesh *editbmesh_get_derived_cage(struct Scene *scene, struct Object *, struct BMEditMesh *em, CustomDataMask dataMask); @@ -630,11 +629,6 @@ void makeDerivedMesh(struct Scene *scene, struct Object *ob, struct BMEditMesh * int editbmesh_get_first_deform_matrices(struct Scene *, struct Object *, struct BMEditMesh *em, float (**deformmats)[3][3], float (**deformcos)[3]); -/* returns an array of deform matrices for crazyspace correction when sculpting, - and the number of modifiers left */ -int sculpt_get_deform_matrices(struct Scene *scene, struct Object *ob, - float (**deformmats)[3][3], float (**deformcos)[3]); - void weight_to_rgb(float r_rgb[3], const float weight); /* Update the weight MCOL preview layer. * If weights are NULL, use object's active vgroup(s). diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 237bfc1b588..1c661b3804f 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -90,7 +90,6 @@ extern void BKE_reset_undo(void); extern char *BKE_undo_menu_string(void); extern void BKE_undo_number(struct bContext *C, int nr); extern const char *BKE_undo_get_name(int nr, int *active); -void BKE_undo_save(char *fname); extern void BKE_undo_save_quit(void); extern struct Main *BKE_undo_get_main(struct Scene **scene); diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 0be0d4b40cc..1ff9bc46638 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -52,7 +52,6 @@ void brush_reset_sculpt(struct Brush *brush); struct ImBuf *get_brush_icon(struct Brush *brush); /* brush library operations used by different paint panels */ -int brush_delete(struct Brush **current_brush); int brush_texture_set_nr(struct Brush *brush, int nr); int brush_texture_delete(struct Brush *brush); int brush_clone_image_set_nr(struct Brush *brush, int nr); diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index ec20e3234a3..c453a9b0497 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -203,11 +203,6 @@ int implicit_free ( struct ClothModifierData *clmd ); int implicit_solver ( struct Object *ob, float frame, struct ClothModifierData *clmd, struct ListBase *effectors ); void implicit_set_positions ( struct ClothModifierData *clmd ); -// globally needed -void clmdSetInterruptCallBack ( int ( *f ) ( void ) ); -//////////////////////////////////////////////// - - ///////////////////////////////////////////////// // cloth.c //////////////////////////////////////////////// @@ -218,7 +213,6 @@ void cloth_free_modifier ( struct ClothModifierData *clmd ); void cloth_init ( struct ClothModifierData *clmd ); void clothModifier_do ( struct ClothModifierData *clmd, struct Scene *scene, struct Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3]); -void cloth_update_normals ( ClothVertex *verts, int nVerts, struct MFace *face, int totface ); int cloth_uses_vgroup(struct ClothModifierData *clmd); // needed for collision.c diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 453c16bb8c8..75fdc4981a0 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -135,16 +135,10 @@ void bvhtree_update_from_mvert ( BVHTree * bvhtree, struct MFace *faces, int num ///////////////////////////////////////////////// -struct LinkNode *BLI_linklist_append_fast ( struct LinkNode **listp, void *ptr ); - // move Collision modifier object inter-frame with step = [0,1] // defined in collisions.c void collision_move_object ( struct CollisionModifierData *collmd, float step, float prevstep ); -// interface for collision functions -void collisions_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 ); -void interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3 ); - ///////////////////////////////////////////////// // used in effect.c ///////////////////////////////////////////////// diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index e5e172accca..99676e444f3 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -291,11 +291,7 @@ void CustomData_bmesh_set_default(struct CustomData *data, void **block); void CustomData_bmesh_free_block(struct CustomData *data, void **block); /* copy custom data to/from layers as in mesh/derivedmesh, to editmesh - blocks of data. the CustomData's must not be compatible */ -void CustomData_to_em_block(const struct CustomData *source, - struct CustomData *dest, int index, void **block); -void CustomData_from_em_block(const struct CustomData *source, - struct CustomData *dest, void *block, int index); + * blocks of data. the CustomData's must not be compatible */ void CustomData_to_bmesh_block(const struct CustomData *source, struct CustomData *dest, int src_index, void **dest_block); void CustomData_from_bmesh_block(const struct CustomData *source, diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h index 1bc85a64c77..fcc9f860471 100644 --- a/source/blender/blenkernel/BKE_depsgraph.h +++ b/source/blender/blenkernel/BKE_depsgraph.h @@ -97,9 +97,6 @@ short are_obs_related(struct DagForest *dag, void *ob1, void *ob2); int is_acyclic(struct DagForest *dag); // //int get_cycles(struct DagForest *dag, struct DagNodeQueue **queues, int *count); // -void boundbox_deps(void); -void draw_all_deps(void); - /* ********** API *************** */ /* Note that the DAG never executes changes in Objects, only sets flags in Objects */ diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index c2706ddb5c0..bb17c891020 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -109,10 +109,6 @@ typedef struct EffectorCache { int flag; } EffectorCache; -struct Effect *copy_effect(struct Effect *eff); -void copy_effects(struct ListBase *lbn, struct ListBase *lb); -void deselectall_eff(struct Object *ob); - void free_partdeflect(struct PartDeflect *pd); struct ListBase *pdInitEffectors(struct Scene *scene, struct Object *ob_src, struct ParticleSystem *psys_src, struct EffectorWeights *weights); void pdEndEffectors(struct ListBase **effectors); diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 5a661f7c731..c4321d25271 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -75,7 +75,6 @@ void IDP_ResizeIDPArray(struct IDProperty *prop, int len); /*this function works for strings too!*/ void IDP_ResizeArray(struct IDProperty *prop, int newlen); void IDP_FreeArray(struct IDProperty *prop); -void IDP_UnlinkArray(struct IDProperty *prop); /* ---------- String Type ------------ */ IDProperty *IDP_NewString(const char *st, const char *name, int maxlen);/* maxlen excludes '\0' */ diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index 722ead80ad9..f5437645551 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -149,9 +149,6 @@ void BKE_image_assign_ibuf(struct Image *ima, struct ImBuf *ibuf); void BKE_image_user_calc_frame(struct ImageUser *iuser, int cfra, int fieldnr); int BKE_image_user_get_frame(const struct ImageUser *iuser, int cfra, int fieldnr); -/* fix things in ImageUser when new image gets assigned */ -void BKE_image_user_new_image(struct Image *ima, struct ImageUser *iuser); - /* sets index offset for multilayer files */ struct RenderPass *BKE_image_multilayer_index(struct RenderResult *rr, struct ImageUser *iuser); diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index e18a510ac07..23da122ed8b 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -83,9 +83,10 @@ void BKE_library_make_local(struct Main *bmain, struct Library *lib, int untagge struct ID *find_id(const char *type, const char *name); void clear_id_newpoins(void); -void IDnames_to_pupstring(const char **str, const char *title, const char *extraops, struct ListBase *lb,struct ID* link, short *nr); -void IMAnames_to_pupstring(const char **str, const char *title, const char *extraops, struct ListBase *lb, struct ID *link, short *nr); -void IPOnames_to_pupstring(const char **str, const char *title, const char *extraops, struct ListBase *lb, struct ID* link, short *nr, int blocktype); +void IDnames_to_pupstring(const char **str, const char *title, const char *extraops, + struct ListBase *lb,struct ID* link, short *nr); +void IMAnames_to_pupstring(const char **str, const char *title, const char *extraops, + struct ListBase *lb, struct ID *link, short *nr); void flag_listbase_ids(ListBase *lb, short flag, short value); void flag_all_listbases_ids(short flag, short value); diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h index 3e73f6b9dd9..99561a687b9 100644 --- a/source/blender/blenkernel/BKE_material.h +++ b/source/blender/blenkernel/BKE_material.h @@ -50,7 +50,6 @@ void free_material(struct Material *sc); void test_object_materials(struct ID *id); void resize_object_material(struct Object *ob, const short totcol); void init_material(struct Material *ma); -struct Material *add_material_main(struct Main *main, const char *name); struct Material *add_material(const char *name); struct Material *copy_material(struct Material *ma); struct Material *localize_material(struct Material *ma); @@ -99,10 +98,6 @@ void free_matcopybuf(void); void copy_matcopybuf(struct Material *ma); void paste_matcopybuf(struct Material *ma); -void clear_mat_mtex_copybuf(void); -void copy_mat_mtex_copybuf(struct ID *id); -void paste_mat_mtex_copybuf(struct ID *id); - /* handle backward compatibility for tface/materials called from doversion (fileload=1) or Help Menu (fileload=0) */ int do_version_tface(struct Main *main, int fileload); diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index e06dee2704e..6c6153523b7 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -253,11 +253,6 @@ void create_vert_poly_map(struct ListBase **map, IndexNode **mem, void create_vert_edge_map(struct ListBase **map, IndexNode **mem, const struct MEdge *medge, const int totvert, const int totedge); -/* functions for making menu's from customdata layers */ -int mesh_layers_menu_charlen(struct CustomData *data, int type); /* use this to work out how many chars to allocate */ -void mesh_layers_menu_concat(struct CustomData *data, int type, char *str); -int mesh_layers_menu(struct CustomData *data, int type); - /* vertex level transformations & checks (no derived mesh) */ int minmax_mesh(struct Mesh *me, float min[3], float max[3]); diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index 2d78e924c90..793ad4dca0e 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -55,8 +55,6 @@ void BKE_movieclip_aspect(struct MovieClip *clip, float *aspx, float *aspy); int BKE_movieclip_has_frame(struct MovieClip *clip, struct MovieClipUser *user); void BKE_movieclip_user_set_frame(struct MovieClipUser *user, int framenr); -void BKE_movieclip_select_track(struct MovieClip *clip, struct MovieTrackingTrack *track, int area, int extend); - void BKE_movieclip_update_scopes(struct MovieClip *clip, struct MovieClipUser *user, struct MovieClipScopes *scopes); void BKE_movieclip_get_cache_segments(struct MovieClip *clip, struct MovieClipUser *user, int *totseg_r, int **points_r); diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index ce87a2e6efc..753161d0788 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -713,9 +713,7 @@ struct TexResult; /* API */ int ntreeTexTagAnimated(struct bNodeTree *ntree); -void ntreeTexSetPreviewFlag(int); void ntreeTexCheckCyclics(struct bNodeTree *ntree); -char* ntreeTexOutputMenu(struct bNodeTree *ntree); struct bNodeTreeExec *ntreeTexBeginExecTree(struct bNodeTree *ntree, int use_tree_data); void ntreeTexEndExecTree(struct bNodeTreeExec *exec, int use_tree_data); diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 69ce590b3ef..1e9bb85b549 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -83,9 +83,6 @@ struct Object *copy_object(struct Object *ob); void make_local_object(struct Object *ob); int object_is_libdata(struct Object *ob); int object_data_is_libdata(struct Object *ob); -void set_mblur_offs(float blur); -void set_field_offs(float field); -void disable_speed_curve(int val); void object_scale_to_mat3(struct Object *ob, float mat[][3]); void object_rot_to_mat3(struct Object *ob, float mat[][3]); @@ -122,7 +119,6 @@ void BKE_scene_foreach_display_point( int BKE_object_parent_loop_check(const struct Object *parent, const struct Object *ob); -void solve_tracking (struct Object *ob, float targetmat[][4]); int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3]); void *object_tfm_backup(struct Object *ob); diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 38f0503b40d..eba5c117199 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -288,12 +288,6 @@ void BKE_ptcache_mem_pointers_init(struct PTCacheMem *pm); void BKE_ptcache_mem_pointers_incr(struct PTCacheMem *pm); int BKE_ptcache_mem_pointers_seek(int point_index, struct PTCacheMem *pm); -/* Copy a specific data type from cache data to point data. */ -void BKE_ptcache_data_get(void **data, int type, int index, void *to); - -/* Copy a specific data type from point data to cache data. */ -void BKE_ptcache_data_set(void **data, int type, void *from); - /* Main cache reading call. */ int BKE_ptcache_read(PTCacheID *pid, float cfra); diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 3cb8e91ac00..d787993e030 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -286,7 +286,6 @@ void seq_update_sound_bounds_all(struct Scene *scene); void seq_update_sound_bounds(struct Scene* scene, struct Sequence *seq); void seq_update_muting(struct Editing *ed); void seq_update_sound(struct Scene *scene, struct bSound *sound); -void seqbase_sound_reload(struct Scene *scene, ListBase *seqbase); void seqbase_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq); void seqbase_dupli_recursive(struct Scene *scene, struct Scene *scene_to, ListBase *nseqbase, ListBase *seqbase, int dupe_flag); diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index 504b859c183..efd38cac232 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -92,8 +92,6 @@ void txt_backspace_word (struct Text *text); int txt_add_char (struct Text *text, unsigned int add); int txt_add_raw_char (struct Text *text, unsigned int add); int txt_replace_char (struct Text *text, unsigned int add); -void txt_export_to_object(struct Text *text); -void txt_export_to_objects(struct Text *text); void txt_unindent (struct Text *text); void txt_comment (struct Text *text); void txt_indent (struct Text *text); @@ -107,8 +105,6 @@ struct TextMarker *txt_find_marker (struct Text *text, struct TextLine *line, i struct TextMarker *txt_find_marker_region (struct Text *text, struct TextLine *line, int start, int end, int group, int flags); struct TextMarker *txt_prev_marker (struct Text *text, struct TextMarker *marker); struct TextMarker *txt_next_marker (struct Text *text, struct TextMarker *marker); -struct TextMarker *txt_prev_marker_color (struct Text *text, struct TextMarker *marker); -struct TextMarker *txt_next_marker_color (struct Text *text, struct TextMarker *marker); /* utility functions, could be moved somewhere more generic but are python/text related */ int text_check_bracket(char ch); diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h index 0db3c5615f5..f27ee2f1a41 100644 --- a/source/blender/blenkernel/depsgraph_private.h +++ b/source/blender/blenkernel/depsgraph_private.h @@ -132,6 +132,4 @@ void graph_print_queue(DagNodeQueue *nqueue); void graph_print_queue_dist(DagNodeQueue *nqueue); void graph_print_adj_list(void); -int build_deps(short mask); - -#endif +#endif /* __DEPSGRAPH_PRIVATE_H__ */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 444b6632d7a..a1cbd98d7e8 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -48,8 +48,6 @@ typedef enum { CCGSubSurf* ccgSubSurf_new (CCGMeshIFC *ifc, int subdivisionLevels, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator); void ccgSubSurf_free (CCGSubSurf *ss); -CCGError ccgSubSurf_sync (CCGSubSurf *ss); - CCGError ccgSubSurf_initFullSync (CCGSubSurf *ss); CCGError ccgSubSurf_initPartialSync (CCGSubSurf *ss); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index d2d3520b118..39cfd1ad9e6 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2773,3 +2773,23 @@ void CDDM_set_mface(DerivedMesh *dm, MFace *mface) cddm->mface = mface; } + +void CDDM_set_mloop(DerivedMesh *dm, MLoop *mloop) +{ + CDDerivedMesh *cddm = (CDDerivedMesh*)dm; + + if (!CustomData_has_layer(&dm->loopData, CD_MLOOP)) + CustomData_add_layer(&dm->loopData, CD_MLOOP, CD_ASSIGN, mloop, dm->numLoopData); + + cddm->mloop = mloop; +} + +void CDDM_set_mpoly(DerivedMesh *dm, MPoly *mpoly) +{ + CDDerivedMesh *cddm = (CDDerivedMesh*)dm; + + if (!CustomData_has_layer(&dm->polyData, CD_MPOLY)) + CustomData_add_layer(&dm->polyData, CD_MPOLY, CD_ASSIGN, mpoly, dm->numPolyData); + + cddm->mpoly = mpoly; +} -- cgit v1.2.3