diff options
22 files changed, 15 insertions, 70 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 8d486218d21..19dd67b88f8 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -124,8 +124,6 @@ void CustomData_free_temporary(struct CustomData *data, int totelem); /* 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); diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index 9cf5a7f31a5..48615e638e8 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -127,7 +127,6 @@ void BKE_mask_get_handle_point_adjacent(struct MaskSpline *spline, struct MaskSp 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 @@ int BKE_mask_layer_shape_spline_from_index(struct MaskLayer *masklay, int index, 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); diff --git a/source/blender/blenkernel/BKE_script.h b/source/blender/blenkernel/BKE_script.h index 9976009c4c2..c3789733a04 100644 --- a/source/blender/blenkernel/BKE_script.h +++ b/source/blender/blenkernel/BKE_script.h @@ -40,8 +40,6 @@ extern "C" { struct Script; -void free_script(struct Script *script); - #ifdef __cplusplus } #endif diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index f099a79b520..f8c1a35776a 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -862,7 +862,7 @@ void BKE_libblock_free(ListBase *lb, void *idv) BKE_text_free((Text *)id); break; case ID_SCRIPT: - //XXX free_script((Script *)id); + /* deprecated */ break; case ID_SPK: BKE_speaker_free((Speaker *)id); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 04c9d96ea0f..bfcb935290d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5746,7 +5746,6 @@ static void direct_link_screen(FileData *fd, bScreen *sc) ScrArea *sa; ScrVert *sv; ScrEdge *se; - int a; link_list(fd, &(sc->vertbase)); link_list(fd, &(sc->edgebase)); @@ -5756,16 +5755,7 @@ static void direct_link_screen(FileData *fd, bScreen *sc) 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); diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index e6efd77f8b2..f8b5a16ec64 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -309,7 +309,7 @@ void COM_deinitialize(void); * @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. diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index ce4e1db23b5..00f88a69fb6 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -3272,7 +3272,7 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void) freeEdgeIndex(&indexed_edges); #ifdef DEBUG_REEB - weightToVCol(em, 1); +// weightToVCol(em, 1); #endif rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution); diff --git a/source/blender/editors/armature/reeb.h b/source/blender/editors/armature/reeb.h index d71e80ca0ca..bb8b3003baf 100644 --- a/source/blender/editors/armature/reeb.h +++ b/source/blender/editors/armature/reeb.h @@ -146,9 +146,9 @@ struct EdgeIndex; 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); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index da440063552..c25401d570f 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -141,9 +141,6 @@ void EDBM_uv_vert_map_free(struct UvVertMap *vmap); 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); diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index 7891315be9f..39e2c28a61a 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -56,18 +56,12 @@ void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated 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: diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index f5c3a4c4d89..935bd13fcfc 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -118,8 +118,6 @@ void SEQUENCER_OT_paste(struct wmOperatorType *ot); 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); diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index d258d271833..f0ff79ae25e 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -46,10 +46,6 @@ struct BMLoop; 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); diff --git a/source/blender/ikplugin/BIK_api.h b/source/blender/ikplugin/BIK_api.h index cbc6485cb54..e1d5f50edfb 100644 --- a/source/blender/ikplugin/BIK_api.h +++ b/source/blender/ikplugin/BIK_api.h @@ -70,9 +70,9 @@ void BIK_clear_cache(struct bPose *pose); 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 diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 2f5ef9c2aaa..0b826070fe4 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -326,7 +326,6 @@ typedef struct MVertSkin { #define TF_SEL2 8 #define TF_SEL3 16 #define TF_SEL4 32 -#define TF_HIDE 64 /* unused, same as TF_SELECT */ /* mtface->mode */ #define TF_DYNAMIC 1 diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 489e1c936c0..23a8cb098f4 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1151,7 +1151,7 @@ typedef struct Scene { #define R_EDGE 0x0020 #define R_FIELDS 0x0040 #define R_FIELDSTILL 0x0080 -#define R_RADIO 0x0100 +/*#define R_RADIO 0x0100 */ /* deprecated */ #define R_BORDER 0x0200 #define R_PANORAMA 0x0400 /* deprecated as scene option, still used in renderer */ #define R_CROP 0x0800 @@ -1349,9 +1349,6 @@ typedef struct Scene { #define TIME2FRA(a) ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base) #define FPS (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base) -#define RAD_PHASE_PATCHES 1 -#define RAD_PHASE_FACES 2 - /* base->flag is in DNA_object_types.h */ /* toolsettings->snap_flag */ diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 34fb7ce60be..b1cd54950e6 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -77,8 +77,6 @@ typedef struct bScreen { struct wmTimer *animtimer; /* if set, screen has timer handler added in window */ void *context; /* context callback */ - - short handler[8]; /* similar to space handler */ } bScreen; typedef struct ScrVert { @@ -214,13 +212,6 @@ typedef struct ARegion { #define PNL_DEFAULT_CLOSED 1 #define PNL_NO_HEADER 2 -/* screen handlers */ -#define SCREEN_MAXHANDLER 8 - -#define SCREEN_HANDLER_ANIM 1 -#define SCREEN_HANDLER_PYTHON 2 -#define SCREEN_HANDLER_VERSE 3 - /* regiontype, first two are the default set */ /* Do NOT change order, append on end. Types are hardcoded needed */ enum { diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index c34ff009405..d094c1d6255 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -381,11 +381,6 @@ enum { SEQ_TYPE_EFFECT_MAX = 31 }; -#define STRIPELEM_FAILED 0 -#define STRIPELEM_OK 1 - -#define STRIPELEM_PREVIEW_DONE 1 - #define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0) #define SEQ_MOVIECLIP_RENDER_STABILIZED (1 << 1) diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 3f9f4d3980e..218027209a8 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -47,7 +47,6 @@ struct ColorBand; /* ************************ style definitions ******************** */ #define MAX_STYLE_NAME 64 -#define MAX_FONT_NAME 256 /* default uifont_id offered by Blender */ #define UIFONT_DEFAULT 0 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 597c2294ade..f34c23a463e 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3553,11 +3553,13 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "mode", R_ENVMAP); RNA_def_property_ui_text(prop, "Environment Maps", "Calculate environment maps while rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); - + +#if 0 prop = RNA_def_property(srna, "use_radiosity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_RADIO); RNA_def_property_ui_text(prop, "Radiosity", "Calculate radiosity in a pre-process before rendering"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); +#endif prop = RNA_def_property(srna, "use_sss", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SSS); diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index e5af51cf2d7..85dbd9356f4 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -63,7 +63,6 @@ struct ReportList; struct Main; #define TABLEINITSIZE 1024 -#define LAMPINITSIZE 256 typedef struct SampleTables { float centLut[16]; diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h index 4bb7d99ba16..74e42109be5 100644 --- a/source/blender/render/intern/include/sunsky.h +++ b/source/blender/render/intern/include/sunsky.h @@ -27,9 +27,7 @@ #ifndef __SUNSKY_H__ #define __SUNSKY_H__ -#define SPECTRUM_MAX_COMPONENTS 100 -#define SPECTRUM_START 350.0 -#define SPECTRUM_END 800.0 +// #define SPECTRUM_MAX_COMPONENTS 100 typedef struct SunSky { short effect_type, skyblendtype, sky_colorspace; diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h index 7f63bcbbecc..3805478fed0 100644 --- a/source/blender/render/intern/include/volumetric.h +++ b/source/blender/render/intern/include/volumetric.h @@ -41,9 +41,6 @@ void shade_volume_outside(ShadeInput *shi, ShadeResult *shr); void shade_volume_inside(ShadeInput *shi, ShadeResult *shr); void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct Isect *last_is); -#define STEPSIZE_VIEW 0 -#define STEPSIZE_SHADE 1 - #define VOL_IS_BACKFACE 1 #define VOL_IS_SAMEMATERIAL 2 |