Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c2
-rw-r--r--source/blender/blenkernel/intern/library.c2
-rw-r--r--source/blender/blenkernel/intern/material.c4
-rw-r--r--source/blender/blenkernel/intern/particle.c4
-rw-r--r--source/blender/blenkernel/intern/texture.c3
-rw-r--r--source/blender/editors/include/BIF_glutil.h4
-rw-r--r--source/blender/editors/screen/glutil.c9
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c2
-rw-r--r--source/blender/editors/util/ed_util.c4
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c15
-rw-r--r--source/blender/makesrna/RNA_enum_types.h2
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c2
13 files changed, 29 insertions, 26 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 574c2842144..aa6d42977ca 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1579,6 +1579,7 @@ struct DagNodeQueue *get_all_childs(struct DagForest *dag, void *ob)
}
/* unused */
+#if 0
short are_obs_related(struct DagForest *dag, void *ob1, void *ob2)
{
DagNode * node;
@@ -1595,6 +1596,7 @@ short are_obs_related(struct DagForest *dag, void *ob1, void *ob2)
}
return DAG_NO_RELATION;
}
+#endif
int is_acyclic( DagForest *dag)
{
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 0506d606607..7e756e853b1 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1055,6 +1055,7 @@ void IDnames_to_pupstring(const char **str, const char *title, const char *extra
}
/* skips viewer images */
+#if 0 /* unused */
void IMAnames_to_pupstring(const char **str, const char *title, const char *extraops, ListBase *lb, ID *link, short *nr)
{
DynStr *pupds= BLI_dynstr_new();
@@ -1075,6 +1076,7 @@ void IMAnames_to_pupstring(const char **str, const char *title, const char *extr
*str= BLI_dynstr_get_cstring(pupds);
BLI_dynstr_free(pupds);
}
+#endif
void id_sort_by_name(ListBase *lb, ID *id)
{
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index f7351887b55..6d44282c60a 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1052,7 +1052,7 @@ int material_in_material(Material *parmat, Material *mat)
}
/* ****************** */
-
+#if 0 /* UNUSED */
static char colname_array[125][20]= {
"Black","DarkRed","HalfRed","Red","Red",
"DarkGreen","DarkOlive","Brown","Chocolate","OrangeRed",
@@ -1098,7 +1098,7 @@ void automatname(Material *ma)
new_id(&G.main->mat, (ID *)ma, colname_array[nr]);
}
-
+#endif
int object_remove_material_slot(Object *ob)
{
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 414677bfc6e..a154a1f8926 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -201,6 +201,8 @@ void psys_set_current_num(Object *ob, int index)
psys->flag &= ~PSYS_CURRENT;
}
}
+
+#if 0 /* UNUSED */
Object *psys_find_object(Scene *scene, ParticleSystem *psys)
{
Base *base;
@@ -215,6 +217,8 @@ Object *psys_find_object(Scene *scene, ParticleSystem *psys)
return NULL;
}
+#endif
+
Object *psys_get_lattice(ParticleSimulationData *sim)
{
Object *lattice=NULL;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 3f40c2bd429..23d818369a2 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -1052,7 +1052,7 @@ void make_local_texture(Tex *tex)
}
/* ------------------------------------------------------------------------- */
-
+#if 0 /* UNUSED */
void autotexname(Tex *tex)
{
Main *bmain= G.main;
@@ -1082,6 +1082,7 @@ void autotexname(Tex *tex)
else new_id(&bmain->tex, (ID *)tex, texstr[tex->type]);
}
}
+#endif
/* ------------------------------------------------------------------------- */
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index ade34c43eec..44195988c40 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -198,12 +198,12 @@ void gla2DSetMap(gla2DDrawInfo *di, struct rctf *rect);
/* use this for platform hacks. glPointSize is solved here */
void bglBegin(int mode);
void bglEnd(void);
-int bglPointHack(void);
+// int bglPointHack(void); /* UNUSED */
void bglVertex3fv(const float vec[3]);
void bglVertex3f(float x, float y, float z);
void bglVertex2fv(const float vec[2]);
/* intel gfx cards frontbuffer problem */
-void bglFlush(void);
+// void bglFlush(void); /* UNUSED */
void set_inverted_drawing(int enable);
void setlinestyle(int nr);
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 66abbaecbe7..5ba0e86e0c1 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -690,6 +690,8 @@ void glaDefine2DArea(rcti *screen_rect)
glLoadIdentity();
}
+#if 0 /* UNUSED */
+
struct gla2DDrawInfo {
int orig_vp[4], orig_sc[4];
float orig_projmat[16], orig_viewmat[16];
@@ -721,7 +723,6 @@ void gla2DSetMap(gla2DDrawInfo *di, rctf *rect)
di->wo_to_sc[1]= sc_h/wo_h;
}
-
gla2DDrawInfo *glaBegin2DDraw(rcti *screen_rect, rctf *world_rect)
{
gla2DDrawInfo *di= MEM_mallocN(sizeof(*di), "gla2DDrawInfo");
@@ -779,6 +780,7 @@ void glaEnd2DDraw(gla2DDrawInfo *di)
MEM_freeN(di);
}
+#endif
/* **************** glPoint hack ************************ */
@@ -805,6 +807,7 @@ void bglBegin(int mode)
}
}
+#if 0 /* UNUSED */
int bglPointHack(void)
{
float value[4];
@@ -818,6 +821,7 @@ int bglPointHack(void)
}
return 0;
}
+#endif
void bglVertex3fv(const float vec[3])
{
@@ -927,6 +931,7 @@ void bglPolygonOffset(float viewdist, float dist)
}
}
+#if 0 /* UNUSED */
void bglFlush(void)
{
glFlush();
@@ -935,4 +940,4 @@ void bglFlush(void)
// XXX myswapbuffers(); //hack to get mac intel graphics to show frontbuffer
#endif
}
-
+#endif
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 38183ac52c7..bd306f2d646 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1003,11 +1003,13 @@ int sequencer_edit_poll(bContext *C)
return (seq_give_editing(CTX_data_scene(C), FALSE) != NULL);
}
+#if 0 /* UNUSED */
int sequencer_strip_poll(bContext *C)
{
Editing *ed;
return (((ed = seq_give_editing(CTX_data_scene(C), FALSE)) != NULL) && (ed->act_seq != NULL));
}
+#endif
int sequencer_strip_has_path_poll(bContext *C)
{
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index c40478f440e..8a0cb4b597b 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1826,7 +1826,7 @@ void VIEW3D_OT_game_start(wmOperatorType *ot)
/* ************************************** */
-void view3d_align_axis_to_vector(View3D *v3d, RegionView3D *rv3d, int axisidx, float vec[3])
+static void UNUSED_FUNCTION(view3d_align_axis_to_vector)(View3D *v3d, RegionView3D *rv3d, int axisidx, float vec[3])
{
float alignaxis[3] = {0.0, 0.0, 0.0};
float norm[3], axis[3], angle, new_quat[4];
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 5dce3d0a2fa..6d9f2732d8a 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -149,7 +149,7 @@ void apply_keyb_grid(int shift, int ctrl, float *val, float fac1, float fac2, fl
}
}
-
+#if 0 /* UNUSED */
int GetButStringLength(const char *str)
{
int rt;
@@ -158,7 +158,7 @@ int GetButStringLength(const char *str)
return rt + 15;
}
-
+#endif
void unpack_menu(bContext *C, const char *opname, const char *id_name, const char *abs_name, const char *folder, struct PackedFile *pf)
{
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index a53a42b616b..c08093e09ee 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -569,21 +569,6 @@ void poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy,
}
}
-void uv_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy)
-{
- uv[0][0] = uv_orig[0][0] * aspx;
- uv[0][1] = uv_orig[0][1] * aspy;
-
- uv[1][0] = uv_orig[1][0] * aspx;
- uv[1][1] = uv_orig[1][1] * aspy;
-
- uv[2][0] = uv_orig[2][0] * aspx;
- uv[2][1] = uv_orig[2][1] * aspy;
-
- uv[3][0] = uv_orig[3][0] * aspx;
- uv[3][1] = uv_orig[3][1] * aspy;
-}
-
int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float *min, float *max)
{
BMEditMesh *em = BMEdit_FromObject(obedit);
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index b544c59a403..afa6a6e9608 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -129,7 +129,7 @@ EnumPropertyItem *rna_Actuator_type_itemf(struct bContext *C, struct PointerRNA
/* Generic functions, return an enum from library data, index is the position
* in the linked list can add more for different types as needed */
EnumPropertyItem *RNA_action_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
-EnumPropertyItem *RNA_action_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
+// EnumPropertyItem *RNA_action_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
EnumPropertyItem *RNA_group_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
EnumPropertyItem *RNA_group_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
EnumPropertyItem *RNA_image_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index b38fa4b58ea..c9306f6dcf7 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4003,10 +4003,12 @@ EnumPropertyItem *RNA_action_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UN
{
return rna_id_itemf(C, ptr, do_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, FALSE);
}
+#if 0 /* UNUSED */
EnumPropertyItem *RNA_action_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *do_free)
{
return rna_id_itemf(C, ptr, do_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, TRUE);
}
+#endif
EnumPropertyItem *RNA_group_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *do_free)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 17:04:40 +0300