[Bf-blender-cvs] [bcf0c714337] master: Cleanup: remove non-existing function declarations
Campbell Barton
noreply at git.blender.org
Sun Dec 30 15:01:13 CET 2018
Commit: bcf0c7143371deba9050eedd0f3474ae4fd91cc9
Author: Campbell Barton
Date: Mon Dec 31 00:57:47 2018 +1100
Branches: master
https://developer.blender.org/rBbcf0c7143371deba9050eedd0f3474ae4fd91cc9
Cleanup: remove non-existing function declarations
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenkernel/BKE_collection.h
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_object_deform.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_texture.h
M source/blender/blenkernel/BKE_writeavi.h
M source/blender/blenloader/BLO_readfile.h
M source/blender/bmesh/intern/bmesh_mesh_conv.h
M source/blender/collada/collada_utils.h
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_manager.h
M source/blender/editors/curve/curve_intern.h
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/include/ED_keyframes_draw.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/mesh/mesh_intern.h
M source/blender/editors/object/object_intern.h
M source/blender/editors/screen/screen_intern.h
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/space_clip/clip_intern.h
M source/blender/editors/space_image/image_intern.h
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/freestyle/FRS_freestyle.h
M source/blender/gpu/GPU_batch_presets.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/GPU_shader.h
M source/blender/imbuf/IMB_imbuf.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_internal.h
M source/blender/python/mathutils/mathutils_noise.h
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/windowmanager/gizmo/WM_gizmo_api.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index c9ea8b3174c..8c1dc77964a 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -494,10 +494,6 @@ void DM_interp_poly_data(
void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const int totcos);
-DerivedMesh *mesh_create_derived_for_modifier(
- struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob,
- struct ModifierData *md, int build_shapekey_layers);
-
DerivedMesh *mesh_create_derived_render(
struct Depsgraph *depsgraph, struct Scene *scene,
struct Object *ob, CustomDataMask dataMask);
@@ -530,8 +526,6 @@ void DM_calc_loop_tangents(
DerivedMesh *dm, bool calc_active_tangent, const char (*tangent_names)[MAX_NAME],
int tangent_names_count);
-void DM_calc_auto_bump_scale(DerivedMesh *dm);
-
void DM_init_origspace(DerivedMesh *dm);
/* debug only */
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 647291382ef..98cf00ef220 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -56,8 +56,6 @@ void BKE_blender_userdef_app_template_data_swap(struct UserDef *userdef_dst, str
void BKE_blender_userdef_app_template_data_set(struct UserDef *userdef);
void BKE_blender_userdef_app_template_data_set_and_free(struct UserDef *userdef);
-void BKE_blender_userdef_data_duplicate(struct UserDef *userdef_dst, struct UserDef *userdef_src);
-
void BKE_blender_userdef_data_free(struct UserDef *userdef, bool clear_fonts);
/* set this callback when a UI is running */
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index d78133499ce..ea824c63c40 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -132,9 +132,6 @@ bool BKE_collection_find_cycle(struct Collection *new_ancestor,
typedef void (*BKE_scene_objects_Cb)(struct Object *ob, void *data);
typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
-void BKE_scene_collections_callback(struct Scene *scene, BKE_scene_collections_Cb callback, void *data);
-void BKE_scene_objects_callback(struct Scene *scene, BKE_scene_objects_Cb callback, void *data);
-
/* Iteratorion over objects in collection. */
#define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN(_collection, _object, _mode) \
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index 1ca8928c61d..062658139af 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -46,7 +46,6 @@ struct Scene;
void init_def_material(void);
void BKE_material_free(struct Material *ma);
-void BKE_material_free_ex(struct Material *ma, bool do_id_user);
void test_object_materials(struct Main *bmain, struct Object *ob, struct ID *id);
void test_all_objects_materials(struct Main *bmain, struct ID *id);
void BKE_material_resize_object(struct Main *bmain, struct Object *ob, const short totcol, bool do_id_user);
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 50e095720e0..8a3bf81911d 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -315,9 +315,6 @@ bool BKE_object_is_animated(struct Scene *scene, struct Object *ob);
int BKE_object_is_modified(struct Scene *scene, struct Object *ob);
int BKE_object_is_deform_modified(struct Scene *scene, struct Object *ob);
-void BKE_object_relink(struct Object *ob);
-void BKE_object_data_relink(struct Object *ob);
-
struct MovieClip *BKE_object_movieclip_get(struct Scene *scene, struct Object *ob, bool use_default);
void BKE_object_runtime_reset(struct Object *object);
diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h
index ab54330cf53..c94b142af9f 100644
--- a/source/blender/blenkernel/BKE_object_deform.h
+++ b/source/blender/blenkernel/BKE_object_deform.h
@@ -79,11 +79,4 @@ void BKE_object_defgroup_mirror_selection(
}
#endif
-/* Select helpers */
-bool *BKE_objdef_vgroup_subset_from_select_type(
- struct Object *ob, enum eVGroupSelect subset_type, int *r_vgroup_tot, int *r_subset_count);
-void BKE_objdef_vgroup_subset_to_index_array(
- const bool *vgroup_validmap, const int vgroup_tot, int *r_vgroup_subset_map);
-
-
#endif /* __BKE_OBJECT_DEFORM_H__ */
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index fd1ba56fd8b..208afa4b67a 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -104,7 +104,6 @@ int BKE_scene_base_iter_next(
struct Scene **scene, int val, struct Base **base, struct Object **ob);
void BKE_scene_base_flag_to_objects(struct ViewLayer *view_layer);
-void BKE_scene_base_flag_from_objects(struct Scene *scene);
void BKE_scene_object_base_flag_sync_from_base(struct Base *base);
void BKE_scene_object_base_flag_sync_from_object(struct Base *base);
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index 228e17cd2ef..2f0d62b4b42 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -73,7 +73,6 @@ struct MTex *BKE_texture_mtex_add_id(struct ID *id, int slot);
/* UNUSED */
// void autotexname(struct Tex *tex);
-struct Tex *give_current_object_texture(struct Object *ob);
struct Tex *give_current_linestyle_texture(struct FreestyleLineStyle *linestyle);
struct Tex *give_current_brush_texture(struct Brush *br);
struct Tex *give_current_particle_texture(struct ParticleSettings *part);
diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h
index 31235047cbd..05a6986528e 100644
--- a/source/blender/blenkernel/BKE_writeavi.h
+++ b/source/blender/blenkernel/BKE_writeavi.h
@@ -56,7 +56,6 @@ typedef struct bMovieHandle {
bMovieHandle *BKE_movie_handle_get(const char imtype);
void BKE_movie_filepath_get(char *string, struct RenderData *rd, bool preview, const char *suffix);
-void BKE_context_create(bMovieHandle *mh);
#ifdef __cplusplus
}
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index a3714e6ac8d..99226b57fe2 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -170,8 +170,6 @@ void BLO_version_defaults_userpref_blend(struct Main *mainvar, struct UserDef *u
struct BlendThumbnail *BLO_thumbnail_from_file(const char *filepath);
-struct Main *BLO_main_from_memfile(struct MemFile *memfile, struct Main *bmain, struct Scene **r_scene);
-
/* datafiles (generated theme) */
extern const struct bTheme U_theme_default;
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.h b/source/blender/bmesh/intern/bmesh_mesh_conv.h
index 8f389a8cf05..6b1cbe0950e 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.h
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.h
@@ -35,12 +35,10 @@
struct Main;
struct Mesh;
-void BM_mesh_cd_validate(BMesh *bm);
void BM_mesh_cd_flag_ensure(BMesh *bm, struct Mesh *mesh, const char cd_flag);
void BM_mesh_cd_flag_apply(BMesh *bm, const char cd_flag);
char BM_mesh_cd_flag_from_bmesh(BMesh *bm);
-
struct BMeshFromMeshParams {
uint calc_face_normal : 1;
/* add a vertex CD_SHAPE_KEYINDEX layer */
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index a79085f0282..91325ec5fd2 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -180,11 +180,13 @@ inline bool bc_startswith(std::string const & value, std::string const & startin
return (value.substr(0, starting.size()) == starting);
}
+#if 0 /* UNUSED */
inline bool bc_endswith(std::string const & value, std::string const & ending)
{
if (ending.size() > value.size()) return false;
return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
}
+#endif
extern std::string bc_replace_string(std::string data, const std::string& pattern, const std::string& replacement);
extern std::string bc_url_encode(std::string data);
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index a321e68b815..9fc0a304c0b 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -992,7 +992,6 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
void EEVEE_create_minmax_buffer(EEVEE_Data *vedata, struct GPUTexture *depth_src, int layer);
void EEVEE_downsample_buffer(EEVEE_Data *vedata, struct GPUTexture *texture_src, int level);
void EEVEE_downsample_cube_buffer(EEVEE_Data *vedata, struct GPUTexture *texture_src, int level);
-void EEVEE_effects_do_gtao(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
void EEVEE_draw_effects(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
void EEVEE_effects_free(void);
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index c4b73fa43ff..a4dbd9a931e 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -250,14 +250,6 @@ typedef struct WORKBENCH_ObjectData {
int object_id;
} WORKBENCH_ObjectData;
-/* workbench_engine.c */
-void workbench_solid_materials_init(WORKBENCH_Data *vedata);
-void workbench_solid_materials_cache_init(WORKBENCH_Data *vedata);
-void workbench_solid_materials_cache_populate(WORKBENCH_Data *vedata, Object *ob);
-void workbench_solid_materials_cache_finish(WORKBENCH_Data *vedata);
-void workbench_solid_materials_draw_scene(WORKBENCH_Data *vedata);
-void workbench_solid_materials_free(void);
-
/* workbench_deferred.c */
void workbench_deferred_engine_init(WORKBENCH_Data *vedata);
void workbench_deferred_engine_free(void);
diff --git a/source/blender/draw/intern/DRW_render.h b/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list