[Bf-blender-cvs] [7654357] master: Code cleanup: declarations for removed functions
Campbell Barton
noreply at git.blender.org
Mon Feb 3 21:21:12 CET 2014
Commit: 76543574bc2902dc846582efbb5eab4ad68094e1
Author: Campbell Barton
Date: Tue Feb 4 07:11:28 2014 +1100
https://developer.blender.org/rB76543574bc2902dc846582efbb5eab4ad68094e1
Code cleanup: declarations for removed functions
===================================================================
M source/blender/blenlib/BLI_scanfill.h
M source/blender/blenlib/intern/winstuff.c
M source/blender/bmesh/intern/bmesh_operators_private.h
M source/blender/editors/include/ED_curve.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_render.h
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_text/text_intern.h
M source/blender/render/extern/include/RE_pipeline.h
M source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
===================================================================
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h
index 3caa69f..bb91b74 100644
--- a/source/blender/blenlib/BLI_scanfill.h
+++ b/source/blender/blenlib/BLI_scanfill.h
@@ -112,9 +112,6 @@ void BLI_scanfill_end(ScanFillContext *sf_ctx);
void BLI_scanfill_begin_arena(ScanFillContext *sf_ctx, struct MemArena *arena);
void BLI_scanfill_end_arena(ScanFillContext *sf_ctx, struct MemArena *arena);
-/* These callbacks are needed to make the lib finction properly */
-void BLI_setErrorCallBack(void (*f)(const char *));
-
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c
index af0ab19..3027d4f 100644
--- a/source/blender/blenlib/intern/winstuff.c
+++ b/source/blender/blenlib/intern/winstuff.c
@@ -225,6 +225,8 @@ void get_default_root(char *root)
}
}
+/* UNUSED */
+#if 0
int check_file_chars(char *filename)
{
char *p = filename;
@@ -245,6 +247,7 @@ int check_file_chars(char *filename)
}
return 1;
}
+#endif
#else
diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h
index 07d0ceb..517a2c4 100644
--- a/source/blender/bmesh/intern/bmesh_operators_private.h
+++ b/source/blender/bmesh/intern/bmesh_operators_private.h
@@ -90,7 +90,6 @@ void bmo_rotate_edges_exec(BMesh *bm, BMOperator *op);
void bmo_rotate_exec(BMesh *bm, BMOperator *op);
void bmo_rotate_uvs_exec(BMesh *bm, BMOperator *op);
void bmo_scale_exec(BMesh *bm, BMOperator *op);
-void bmo_shortest_path_exec(BMesh *bm, BMOperator *op);
void bmo_similar_edges_exec(BMesh *bm, BMOperator *op);
void bmo_similar_faces_exec(BMesh *bm, BMOperator *op);
void bmo_similar_verts_exec(BMesh *bm, BMOperator *op);
diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h
index d3b3425..2a04840 100644
--- a/source/blender/editors/include/ED_curve.h
+++ b/source/blender/editors/include/ED_curve.h
@@ -84,7 +84,6 @@ bool ED_curve_select_nth(struct Curve *cu, int nth);
void ED_curve_beztcpy(struct EditNurb *editnurb, struct BezTriple *dst, struct BezTriple *src, int count);
void ED_curve_bpcpy(struct EditNurb *editnurb, struct BPoint *dst, struct BPoint *src, int count);
-struct Nurb *ED_curve_nurbcpy(struct Nurb *src, int count);
int ED_curve_updateAnimPaths(struct Curve *cu);
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 6d9a057..04f8dfc 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -174,11 +174,6 @@ void EDBM_select_swap(struct BMEditMesh *em); /* exported for UV */
bool EDBM_select_interior_faces(struct BMEditMesh *em);
void em_setup_viewcontext(struct bContext *C, struct ViewContext *vc); /* rename? */
-/* editmesh_statvis.c */
-void EDBM_statvis_calc(struct BMEditMesh *em, struct MeshStatVis *statvis,
- unsigned char (*r_face_colors)[4]);
-
-
extern unsigned int bm_vertoffs, bm_solidoffs, bm_wireoffs;
/* mesh_ops.c */
diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h
index 8f39502..14595a4 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -52,7 +52,6 @@ void ED_render_id_flush_update(struct Main *bmain, struct ID *id);
void ED_render_engine_changed(struct Main *bmain);
void ED_render_engine_area_exit(struct ScrArea *sa);
void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated);
-void ED_render_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrArea *sa);
void ED_viewport_render_kill_jobs(const struct bContext *C, bool free_database);
struct Scene *ED_render_job_get_scene(const struct bContext *C);
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h
index 57eaa45..8d3efd0 100644
--- a/source/blender/editors/sculpt_paint/paint_intern.h
+++ b/source/blender/editors/sculpt_paint/paint_intern.h
@@ -256,7 +256,6 @@ typedef enum {
} PaintMaskFloodMode;
void PAINT_OT_mask_flood_fill(struct wmOperatorType *ot);
-void PAINT_OT_mask_box_fill(struct wmOperatorType *ot);
void PAINT_OT_mask_lasso_gesture(struct wmOperatorType *ot);
#endif /* __PAINT_INTERN_H__ */
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 34d7f87..b1278c7 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -162,7 +162,6 @@ typedef enum {
/* outliner_tree.c ----------------------------------------------- */
-void outliner_rebuild_treehash(struct SpaceOops *soops);
void outliner_free_tree(ListBase *lb);
void outliner_cleanup_tree(struct SpaceOops *soops);
diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h
index 5d0c718..d4cd029 100644
--- a/source/blender/editors/space_text/text_intern.h
+++ b/source/blender/editors/space_text/text_intern.h
@@ -75,8 +75,6 @@ int text_get_char_pos(struct SpaceText *st, const char *line, int cur);
void text_drawcache_tag_update(struct SpaceText *st, int full);
void text_free_caches(struct SpaceText *st);
-int text_file_modified(struct Text *text);
-
int text_do_suggest_select(struct SpaceText *st, struct ARegion *ar);
void text_pop_suggest_list(void);
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 18367b9..7251ba7 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -217,9 +217,6 @@ void RE_DataBase_ApplyWindow(struct Render *re);
/* rotate scene again, for incremental render */
void RE_DataBase_IncrementalView(struct Render *re, float viewmat[4][4], int restore);
-/* override the scene setting for amount threads, commandline */
-void RE_set_max_threads(int threads);
-
/* set the render threads based on the commandline and autothreads setting */
void RE_init_threadcount(Render *re);
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index 1ed3a99..0ebaec9 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -138,14 +138,6 @@ struct KX_ObjectProperties
} m_boundobject;
};
-void KX_ConvertDynamoObject(KX_GameObject* gameobj,
- RAS_MeshObject* meshobj,
- KX_Scene* kxscene,
- struct PHY_ShapeProps* shapeprops,
- struct PHY_MaterialProps* smmaterial,
- struct KX_ObjectProperties* objprop);
-
-
#ifdef WITH_BULLET
void KX_ConvertBulletObject( class KX_GameObject* gameobj,
More information about the Bf-blender-cvs
mailing list