[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45872] trunk/blender/source/blender: code cleanup: comment unused functions ( removed one which isnt useful anymore).
Campbell Barton
ideasman42 at gmail.com
Mon Apr 23 09:32:13 CEST 2012
Revision: 45872
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45872
Author: campbellbarton
Date: 2012-04-23 07:32:13 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
code cleanup: comment unused functions (removed one which isnt useful anymore).
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/editors/include/BIF_glutil.h
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/util/ed_util.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -1579,6 +1579,7 @@
}
/* unused */
+#if 0
short are_obs_related(struct DagForest *dag, void *ob1, void *ob2)
{
DagNode * node;
@@ -1595,6 +1596,7 @@
}
return DAG_NO_RELATION;
}
+#endif
int is_acyclic( DagForest *dag)
{
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -1055,6 +1055,7 @@
}
/* 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 @@
*str= BLI_dynstr_get_cstring(pupds);
BLI_dynstr_free(pupds);
}
+#endif
void id_sort_by_name(ListBase *lb, ID *id)
{
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -1052,7 +1052,7 @@
}
/* ****************** */
-
+#if 0 /* UNUSED */
static char colname_array[125][20]= {
"Black","DarkRed","HalfRed","Red","Red",
"DarkGreen","DarkOlive","Brown","Chocolate","OrangeRed",
@@ -1098,8 +1098,8 @@
new_id(&G.main->mat, (ID *)ma, colname_array[nr]);
}
+#endif
-
int object_remove_material_slot(Object *ob)
{
Material *mao, ***matarar;
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -201,6 +201,8 @@
psys->flag &= ~PSYS_CURRENT;
}
}
+
+#if 0 /* UNUSED */
Object *psys_find_object(Scene *scene, ParticleSystem *psys)
{
Base *base;
@@ -215,6 +217,8 @@
return NULL;
}
+#endif
+
Object *psys_get_lattice(ParticleSimulationData *sim)
{
Object *lattice=NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -1052,7 +1052,7 @@
}
/* ------------------------------------------------------------------------- */
-
+#if 0 /* UNUSED */
void autotexname(Tex *tex)
{
Main *bmain= G.main;
@@ -1082,6 +1082,7 @@
else new_id(&bmain->tex, (ID *)tex, texstr[tex->type]);
}
}
+#endif
/* ------------------------------------------------------------------------- */
Modified: trunk/blender/source/blender/editors/include/BIF_glutil.h
===================================================================
--- trunk/blender/source/blender/editors/include/BIF_glutil.h 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/editors/include/BIF_glutil.h 2012-04-23 07:32:13 UTC (rev 45872)
@@ -198,12 +198,12 @@
/* 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);
Modified: trunk/blender/source/blender/editors/screen/glutil.c
===================================================================
--- trunk/blender/source/blender/editors/screen/glutil.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/editors/screen/glutil.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -690,6 +690,8 @@
glLoadIdentity();
}
+#if 0 /* UNUSED */
+
struct gla2DDrawInfo {
int orig_vp[4], orig_sc[4];
float orig_projmat[16], orig_viewmat[16];
@@ -721,7 +723,6 @@
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 @@
MEM_freeN(di);
}
+#endif
/* **************** glPoint hack ************************ */
@@ -805,6 +807,7 @@
}
}
+#if 0 /* UNUSED */
int bglPointHack(void)
{
float value[4];
@@ -818,6 +821,7 @@
}
return 0;
}
+#endif
void bglVertex3fv(const float vec[3])
{
@@ -927,6 +931,7 @@
}
}
+#if 0 /* UNUSED */
void bglFlush(void)
{
glFlush();
@@ -935,4 +940,4 @@
// XXX myswapbuffers(); //hack to get mac intel graphics to show frontbuffer
#endif
}
-
+#endif
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -1003,11 +1003,13 @@
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)
{
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -1826,7 +1826,7 @@
/* ************************************** */
-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];
Modified: trunk/blender/source/blender/editors/util/ed_util.c
===================================================================
--- trunk/blender/source/blender/editors/util/ed_util.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/editors/util/ed_util.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -149,7 +149,7 @@
}
}
-
+#if 0 /* UNUSED */
int GetButStringLength(const char *str)
{
int rt;
@@ -158,8 +158,8 @@
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)
{
PointerRNA props_ptr;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -569,21 +569,6 @@
}
}
-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);
Modified: trunk/blender/source/blender/makesrna/RNA_enum_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_enum_types.h 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/makesrna/RNA_enum_types.h 2012-04-23 07:32:13 UTC (rev 45872)
@@ -129,7 +129,7 @@
/* 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);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2012-04-23 07:26:08 UTC (rev 45871)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2012-04-23 07:32:13 UTC (rev 45872)
@@ -4003,10 +4003,12 @@
{
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)
{
More information about the Bf-blender-cvs
mailing list