[Bf-blender-cvs] [a74f0dc0e30] master: Cleanup: declatatuons for functions that don't exist
Campbell Barton
noreply at git.blender.org
Thu Feb 20 02:25:42 CET 2020
Commit: a74f0dc0e306d79d8a6de5277538d7333132fc34
Author: Campbell Barton
Date: Thu Feb 20 10:07:13 2020 +1100
Branches: master
https://developer.blender.org/rBa74f0dc0e306d79d8a6de5277538d7333132fc34
Cleanup: declatatuons for functions that don't exist
===================================================================
M source/blender/avi/AVI_avi.h
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_object.h
M source/blender/collada/collada_utils.h
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/overlay/overlay_private.h
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_view.h
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_interface_icons.h
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/GPU_texture.h
M source/blender/gpu/intern/gpu_vertex_format_private.h
M source/blender/makesrna/intern/rna_internal.h
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/windowmanager/WM_types.h
===================================================================
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index e14d947f5dd..4f3aa720da3 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -295,6 +295,5 @@ AviError AVI_write_frame(AviMovie *movie, int frame_num, ...);
* Unused but still external
*/
AviError AVI_print_error(AviError error);
-void AVI_set_debug(int mode);
#endif /* __AVI_AVI_H__ */
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index e167cfd6fcb..28b027fe70e 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -362,11 +362,6 @@ void DM_interp_vert_data(struct DerivedMesh *source,
void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const int totcos);
-DerivedMesh *mesh_create_derived_render(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *ob,
- const struct CustomData_MeshMasks *dataMask);
-
/* same as above but wont use render settings */
struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph,
struct Scene *scene,
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index cf516c630c5..8fd33fff803 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -86,7 +86,6 @@ short BKE_curve_type_get(struct Curve *cu);
void BKE_curve_type_test(struct Object *ob);
void BKE_curve_curve_dimension_update(struct Curve *cu);
-void BKE_curve_boundbox_calc(struct Curve *cu, float r_loc[3], float r_size[3]);
struct BoundBox *BKE_curve_boundbox_get(struct Object *ob);
void BKE_curve_texspace_calc(struct Curve *cu);
@@ -144,8 +143,6 @@ void BKE_curve_editNurb_keyIndex_free(struct GHash **keyindex);
void BKE_curve_editNurb_free(struct Curve *cu);
struct ListBase *BKE_curve_editNurbs_get(struct Curve *cu);
-float *BKE_curve_surf_make_orco(struct Object *ob);
-
void BKE_curve_bevelList_free(struct ListBase *bev);
void BKE_curve_bevelList_make(struct Object *ob, struct ListBase *nurbs, bool for_render);
void BKE_curve_bevel_make(struct Object *ob, struct ListBase *disp);
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 54cd172655e..4ea33d39385 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -299,7 +299,6 @@ void BKE_object_eval_transform_all(struct Depsgraph *depsgraph,
struct Scene *scene,
struct Object *object);
-void BKE_object_eval_update_shading(struct Depsgraph *depsgraph, struct Object *object);
void BKE_object_data_select_update(struct Depsgraph *depsgraph, struct ID *object_data);
void BKE_object_select_update(struct Depsgraph *depsgraph, struct Object *object);
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index b313fcd6e66..5c5e1415422 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -119,13 +119,6 @@ inline bAction *bc_getSceneMaterialAction(Material *ma)
return (ma->adt && ma->adt->action) ? ma->adt->action : NULL;
}
-inline void bc_setSceneObjectAction(bAction *action, Object *ob)
-{
- if (ob->adt) {
- ob->adt->action = action;
- }
-}
-
std::string bc_get_action_id(std::string action_name,
std::string ob_name,
std::string channel_type,
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index bb3bb360d97..7810de289df 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -1100,7 +1100,6 @@ void EEVEE_effects_draw_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_draw_alpha_checker(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/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h
index 6ab6da9a18d..4cd3877f21f 100644
--- a/source/blender/draw/engines/overlay/overlay_private.h
+++ b/source/blender/draw/engines/overlay/overlay_private.h
@@ -409,7 +409,6 @@ void OVERLAY_background_draw(OVERLAY_Data *vedata);
void OVERLAY_bone_instance_data_set_color_hint(BoneInstanceData *data, const float hint_color[4]);
void OVERLAY_bone_instance_data_set_color(BoneInstanceData *data, const float bone_color[4]);
-void OVERLAY_edit_curve_init(OVERLAY_Data *vedata);
void OVERLAY_edit_curve_cache_init(OVERLAY_Data *vedata);
void OVERLAY_edit_curve_cache_populate(OVERLAY_Data *vedata, Object *ob);
void OVERLAY_edit_surf_cache_populate(OVERLAY_Data *vedata, Object *ob);
diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h
index 508a6f2c46d..cb81bdafe62 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -44,7 +44,6 @@ struct GPUBatch *DRW_cache_quad_get(void);
struct GPUBatch *DRW_cache_quad_wires_get(void);
struct GPUBatch *DRW_cache_cube_get(void);
struct GPUBatch *DRW_cache_sphere_get(void);
-struct GPUBatch *DRW_cache_screenspace_circle_get(void);
struct GPUBatch *DRW_cache_normal_arrow_get(void);
/* Common Object */
diff --git a/source/blender/draw/intern/draw_view.h b/source/blender/draw/intern/draw_view.h
index c8f0cd7c11c..04f7d2bbabb 100644
--- a/source/blender/draw/intern/draw_view.h
+++ b/source/blender/draw/intern/draw_view.h
@@ -25,7 +25,6 @@
void DRW_draw_region_info(void);
void DRW_clear_background(void);
-void DRW_draw_background(bool do_alpha_checker);
void DRW_draw_cursor(void);
void DRW_draw_gizmo_3d(void);
void DRW_draw_gizmo_2d(void);
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 23dbf24ed7b..5073207daa5 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -116,8 +116,6 @@ struct bGPdata *ED_annotation_data_get_active_direct(struct ID *screen_id,
bool ED_gpencil_data_owner_is_annotation(struct PointerRNA *owner_ptr);
/* 3D View */
-struct bGPdata *ED_gpencil_data_get_active_v3d(struct ViewLayer *view_layer, struct View3D *v3d);
-
bool ED_gpencil_has_keyframe_v3d(struct Scene *scene, struct Object *ob, int cfra);
/* ----------- Stroke Editing Utilities ---------------- */
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index a808e24ded3..8d84cf9deb6 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -2035,7 +2035,6 @@ eAutoPropButsReturn uiTemplateOperatorPropertyButs(const struct bContext *C,
const eButLabelAlign label_align,
const short flag);
void uiTemplateHeader3D_mode(uiLayout *layout, struct bContext *C);
-void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C);
void uiTemplateReportsBanner(uiLayout *layout, struct bContext *C);
void uiTemplateInputStatus(uiLayout *layout, struct bContext *C);
@@ -2056,8 +2055,6 @@ void uiTemplateCacheFile(uiLayout *layout,
struct PointerRNA *ptr,
const char *propname);
-struct ColorBand *UI_block_get_colorband_from_template_menu(struct uiBlock *block);
-
/* Default UIList class name, keep in sync with its declaration in bl_ui/__init__.py */
#define UI_UL_DEFAULT_CLASS_NAME "UI_UL_list"
void uiTemplateList(uiLayout *layout,
diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h
index db8afccbe2d..45fa9bc8442 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -78,14 +78,6 @@ void UI_icon_draw_ex(float x,
const uchar mono_color[4],
const bool mono_border);
-void UI_icon_draw_desaturate(float x,
- float y,
- int icon_id,
- float aspect,
- float alpha,
- float desaturate,
- const char mono_color[4]);
-
void UI_icons_free(void);
void UI_icons_free_drawinfo(void *drawinfo);
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index ddbb64bf067..c1690445a41 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -232,9 +232,6 @@ void ED_view3d_cameracontrol_update(struct View3DCameraControl *vctrl,
void ED_view3d_cameracontrol_release(struct View3DCameraControl *vctrl, const bool restore);
struct Object *ED_view3d_cameracontrol_object_get(struct View3DCameraControl *vctrl);
-/* view3d_toolbar.c */
-void VIEW3D_OT_toolshelf(struct wmOperatorType *ot);
-
/* view3d_snap.c */
bool ED_view3d_minmax_verts(struct Object *obedit, float min[3], float max[3]);
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index 075829065df..952bbfe72fa 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -143,7 +143,6 @@ GPUNodeLink *GPU_attribute(CustomDataType type, const char *name);
GPUNodeLink *GPU_constant(float *num);
GPUNodeLink *GPU_uniform(float *num);
GPUNodeLink *GPU_image(struct Image *ima, struct ImageUser *iuser);
-GPUNodeLi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list