[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50438] trunk/blender/source/blender: code cleanup: remove deprecated defines and some struct members
Campbell Barton
ideasman42 at gmail.com
Thu Sep 6 02:34:00 CEST 2012
Revision: 50438
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50438
Author: campbellbarton
Date: 2012-09-06 00:33:59 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
code cleanup: remove deprecated defines and some struct members
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/BKE_mask.h
trunk/blender/source/blender/blenkernel/BKE_script.h
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/compositor/COM_compositor.h
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/armature/reeb.h
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/include/ED_render.h
trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h
trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
trunk/blender/source/blender/ikplugin/BIK_api.h
trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/render/intern/include/sunsky.h
trunk/blender/source/blender/render/intern/include/volumetric.h
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -124,8 +124,6 @@
/* adds a data layer of the given type to the CustomData object, optionally
* backed by an external data array. the different allocation types are
* defined above. returns the data of the layer.
- *
- * in editmode, use EDBM_data_layer_add instead of this function
*/
void *CustomData_add_layer(struct CustomData *data, int type, int alloctype,
void *layer, int totelem);
Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -127,7 +127,6 @@
void BKE_mask_layer_calc_handles(struct MaskLayer *masklay);
void BKE_mask_layer_calc_handles_deform(struct MaskLayer *masklay);
void BKE_mask_calc_handles(struct Mask *mask);
-void BKE_mask_calc_handles_deform(struct Mask *mask);
void BKE_mask_spline_ensure_deform(struct MaskSpline *spline);
/* animation */
@@ -153,8 +152,6 @@
struct MaskSpline **r_masklay_shape, int *r_index);
int BKE_mask_layer_shape_spline_to_index(struct MaskLayer *masklay, struct MaskSpline *spline);
-int BKE_mask_layer_shape_spline_index(struct MaskLayer *masklay, int index,
- struct MaskSpline **r_masklay_shape, int *r_index);
void BKE_mask_layer_shape_changed_add(struct MaskLayer *masklay, int index,
int do_init, int do_init_interpolate);
Modified: trunk/blender/source/blender/blenkernel/BKE_script.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_script.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/blenkernel/BKE_script.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -40,8 +40,6 @@
struct Script;
-void free_script(struct Script *script);
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-09-06 00:33:59 UTC (rev 50438)
@@ -862,7 +862,7 @@
BKE_text_free((Text *)id);
break;
case ID_SCRIPT:
- //XXX free_script((Script *)id);
+ /* deprecated */
break;
case ID_SPK:
BKE_speaker_free((Speaker *)id);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-06 00:33:59 UTC (rev 50438)
@@ -5746,7 +5746,6 @@
ScrArea *sa;
ScrVert *sv;
ScrEdge *se;
- int a;
link_list(fd, &(sc->vertbase));
link_list(fd, &(sc->edgebase));
@@ -5756,16 +5755,7 @@
sc->mainwin = sc->subwinactive= 0; /* indices */
sc->swap = 0;
-
- /* hacky patch... but people have been saving files with the verse-blender,
- * causing the handler to keep running for ever, with no means to disable it */
- for (a = 0; a < SCREEN_MAXHANDLER; a+=2) {
- if (sc->handler[a] == SCREEN_HANDLER_VERSE) {
- sc->handler[a] = 0;
- break;
- }
- }
-
+
/* edges */
for (se = sc->edgebase.first; se; se = se->next) {
se->v1 = newdataadr(fd, se->v1);
Modified: trunk/blender/source/blender/compositor/COM_compositor.h
===================================================================
--- trunk/blender/source/blender/compositor/COM_compositor.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/compositor/COM_compositor.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -309,7 +309,7 @@
* @brief Clear all compositor caches. (Compositor system will still remain available).
* To deinitialize the compositor use the COM_deinitialize method.
*/
-void COM_clearCaches(void);
+// void COM_clearCaches(void); // NOT YET WRITTEN
/**
* @brief Return a list of highlighted bnodes pointers.
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2012-09-06 00:33:59 UTC (rev 50438)
@@ -3272,7 +3272,7 @@
freeEdgeIndex(&indexed_edges);
#ifdef DEBUG_REEB
- weightToVCol(em, 1);
+// weightToVCol(em, 1);
#endif
rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
Modified: trunk/blender/source/blender/editors/armature/reeb.h
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/editors/armature/reeb.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -146,9 +146,9 @@
int weightToHarmonic(struct EditMesh *em, struct EdgeIndex *indexed_edges);
int weightFromDistance(struct EditMesh *em, struct EdgeIndex *indexed_edges);
int weightFromLoc(struct EditMesh *me, int axis);
-void weightToVCol(struct EditMesh *em, int index);
+//void weightToVCol(struct EditMesh *em, int index);
void arcToVCol(struct ReebGraph *rg, struct EditMesh *em, int index);
-void angleToVCol(struct EditMesh *em, int index);
+//void angleToVCol(struct EditMesh *em, int index);
void renormalizeWeight(struct EditMesh *em, float newmax);
ReebGraph *generateReebGraph(struct EditMesh *me, int subdivisions);
Modified: trunk/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mesh.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/editors/include/ED_mesh.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -141,9 +141,6 @@
struct UvMapVert *EDBM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int v);
struct UvVertMap *EDBM_uv_vert_map_create(struct BMEditMesh *em, int selected, int do_face_idx_array, const float limit[2]);
-void EDBM_data_layer_add(struct BMEditMesh *em, struct CustomData *data, int type, const char *name);
-void EDBM_data_layer_free(struct BMEditMesh *em, struct CustomData *data, int type);
-
void EDBM_select_toggle_all(struct BMEditMesh *em);
void EDBM_select_swap(struct BMEditMesh *em); /* exported for UV */
int EDBM_select_interior_faces(struct BMEditMesh *em);
Modified: trunk/blender/source/blender/editors/include/ED_render.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_render.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/editors/include/ED_render.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -56,18 +56,12 @@
typedef struct RenderInfo {
int pr_rectx;
int pr_recty;
- short curtile, tottile, status;
+ short curtile, tottile;
rcti disprect; /* storage for view3d preview rect */
unsigned int *rect;
struct Render *re; /* persistent render */
} RenderInfo;
-/* ri->status */
-#define PR_DBASE 1
-#define PR_DISPRECT 2
-#define PR_PROJECTED 4
-#define PR_ROTATED 8
-
/* Render the preview
*
* pr_method:
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -118,8 +118,6 @@
void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot);
-void SEQUENCER_OT_update_strip_length(struct wmOperatorType *ot);
-
/* preview specific operators */
void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_intern.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_intern.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -46,10 +46,6 @@
struct BMEdge;
struct BMVert;
-/* id can be from 0 to 3 */
-#define TF_PIN_MASK(id) (TF_PIN1 << id)
-#define TF_SEL_MASK(id) (TF_SEL1 << id)
-
/* visibility and selection */
int uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa);
Modified: trunk/blender/source/blender/ikplugin/BIK_api.h
===================================================================
--- trunk/blender/source/blender/ikplugin/BIK_api.h 2012-09-05 23:30:30 UTC (rev 50437)
+++ trunk/blender/source/blender/ikplugin/BIK_api.h 2012-09-06 00:33:59 UTC (rev 50438)
@@ -70,9 +70,9 @@
void BIK_update_param(struct bPose *pose);
void BIK_test_constraint(struct Object *ob, struct bConstraint *cons);
// not yet implemented
-int BIK_get_constraint_param(struct bPose *pose, struct bConstraint *cons, int id, BIK_ParamValue *value);
-int BIK_get_channel_param(struct bPose *pose, struct bPoseChannel *pchan, int id, BIK_ParamValue *value);
-int BIK_get_solver_param(struct bPose *pose, struct bPoseChannel *pchan, int id, BIK_ParamValue *value);
+// int BIK_get_constraint_param(struct bPose *pose, struct bConstraint *cons, int id, BIK_ParamValue *value);
+// int BIK_get_channel_param(struct bPose *pose, struct bPoseChannel *pchan, int id, BIK_ParamValue *value);
+// int BIK_get_solver_param(struct bPose *pose, struct bPoseChannel *pchan, int id, BIK_ParamValue *value);
// number of solver available
// 0 = iksolver
Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h 2012-09-05 23:30:30 UTC (rev 50437)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list