forked from bartvdbraak/blender
Maintenance,
- remove some redundant declarations - changed VertexTangent and Path structs to avoid compiler alignment padding.
This commit is contained in:
parent
4dc59fff28
commit
fa4bbbb249
@ -44,10 +44,6 @@ void do_versions_ipos_to_animato(struct Main *main);
|
||||
|
||||
void free_ipo(struct Ipo *ipo);
|
||||
|
||||
// xxx perhaps this should be in curve api not in anim api
|
||||
void correct_bezpart(float *v1, float *v2, float *v3, float *v4);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
};
|
||||
#endif
|
||||
|
@ -127,12 +127,7 @@ struct pgn_elements {
|
||||
char *data;
|
||||
};
|
||||
|
||||
void calc_mballco(struct MetaElem *ml, float *vec);
|
||||
float densfunc(struct MetaElem *ball, float x, float y, float z);
|
||||
octal_node* find_metaball_octal_node(octal_node *node, float x, float y, float z, short depth);
|
||||
float metaball(float x, float y, float z);
|
||||
void accum_mballfaces(int i1, int i2, int i3, int i4);
|
||||
void *new_pgn_element(int size);
|
||||
|
||||
void freepolygonize(PROCESS *p);
|
||||
void docube(CUBE *cube, PROCESS *p, struct MetaBall *mb);
|
||||
|
@ -399,7 +399,6 @@ int ntreeCompositTagAnimated(struct bNodeTree *ntree);
|
||||
void ntreeCompositTagGenerators(struct bNodeTree *ntree);
|
||||
void ntreeCompositForceHidden(struct bNodeTree *ntree, struct Scene *scene);
|
||||
|
||||
void free_compbuf(struct CompBuf *cbuf); /* internal...*/
|
||||
|
||||
|
||||
/* ************** TEXTURE NODES *************** */
|
||||
|
@ -90,6 +90,7 @@ struct Object *add_object(struct Scene *scene, int type);
|
||||
struct Object *copy_object(struct Object *ob);
|
||||
void expand_local_object(struct Object *ob);
|
||||
void make_local_object(struct Object *ob);
|
||||
int object_is_libdata(struct Object *ob);
|
||||
int object_data_is_libdata(struct Object *ob);
|
||||
void set_mblur_offs(float blur);
|
||||
void set_field_offs(float field);
|
||||
|
@ -43,7 +43,7 @@
|
||||
|
||||
#include "BKE_colortools.h"
|
||||
#include "BKE_curve.h"
|
||||
#include "BKE_ipo.h"
|
||||
#include "BKE_fcurve.h"
|
||||
#include "BKE_utildefines.h"
|
||||
|
||||
#include "BLI_blenlib.h"
|
||||
|
@ -1972,7 +1972,6 @@ static void composit_begin_exec(bNodeTree *ntree, int is_group)
|
||||
/* copy stack compbufs to sockets */
|
||||
static void composit_end_exec(bNodeTree *ntree, int is_group)
|
||||
{
|
||||
extern void print_compbuf(char *str, struct CompBuf *cbuf);
|
||||
bNode *node;
|
||||
bNodeStack *ns;
|
||||
int a;
|
||||
|
@ -96,7 +96,6 @@ int isect_ray_tri_epsilon_v3(float p1[3], float d[3],
|
||||
float v0[3], float v1[3], float v2[3], float *lambda, float *uv, float epsilon);
|
||||
|
||||
/* point in polygon */
|
||||
int isect_point_tri_v2(float p[2], float a[2], float b[2], float c[2]);
|
||||
int isect_point_quad_v2(float p[2], float a[2], float b[2], float c[2], float d[2]);
|
||||
|
||||
int isect_point_tri_v2(float v1[2], float v2[2], float v3[2], float pt[2]);
|
||||
@ -165,8 +164,8 @@ void map_to_sphere(float *u, float *v, float x, float y, float z);
|
||||
/********************************* Tangents **********************************/
|
||||
|
||||
typedef struct VertexTangent {
|
||||
float tang[3], uv[2];
|
||||
struct VertexTangent *next;
|
||||
float tang[3], uv[2];
|
||||
} VertexTangent;
|
||||
|
||||
float *find_vertex_tangent(VertexTangent *vtang, float *uv);
|
||||
|
@ -79,6 +79,8 @@
|
||||
/* local */
|
||||
#define UNIQUE_NAME_MAX 128
|
||||
|
||||
extern char bprogname[];
|
||||
|
||||
static int add_win32_extension(char *name);
|
||||
static char *blender_version_decimal(void);
|
||||
|
||||
@ -894,7 +896,6 @@ static int test_env_path(char *path, const char *envvar)
|
||||
|
||||
static int get_path_local(char *targetpath, const char *folder_name, const char *subfolder_name)
|
||||
{
|
||||
extern char bprogname[]; /* argv[0] from creator.c */
|
||||
char bprogdir[FILE_MAX];
|
||||
char relfolder[FILE_MAX];
|
||||
|
||||
@ -963,7 +964,6 @@ static int get_path_system(char *targetpath, const char *folder_name, const char
|
||||
|
||||
/* first allow developer only overrides to the system path
|
||||
* these are only used when running blender from source */
|
||||
extern char bprogname[]; /* argv[0] from creator.c */
|
||||
char cwd[FILE_MAX];
|
||||
char relfolder[FILE_MAX];
|
||||
char bprogdir[FILE_MAX];
|
||||
@ -1778,7 +1778,6 @@ void BLI_where_is_temp(char *fullname, int usertemp)
|
||||
}
|
||||
|
||||
char *get_install_dir(void) {
|
||||
extern char bprogname[];
|
||||
char *tmpname = BLI_strdup(bprogname);
|
||||
char *cut;
|
||||
|
||||
|
@ -104,7 +104,6 @@ void POSE_OT_select_grouped(struct wmOperatorType *ot);
|
||||
|
||||
void POSE_OT_group_add(struct wmOperatorType *ot);
|
||||
void POSE_OT_group_remove(struct wmOperatorType *ot);
|
||||
void POSE_OT_group_remove(struct wmOperatorType *ot);
|
||||
void POSE_OT_group_assign(struct wmOperatorType *ot);
|
||||
void POSE_OT_group_unassign(struct wmOperatorType *ot);
|
||||
void POSE_OT_group_select(struct wmOperatorType *ot);
|
||||
|
@ -105,10 +105,6 @@ typedef struct SK_StrokeIterator {
|
||||
|
||||
void initStrokeIterator(BArcIterator *iter, SK_Stroke *stk, int start, int end);
|
||||
|
||||
void sk_deleteSelectedStrokes(SK_Sketch *sketch);
|
||||
|
||||
SK_Point *sk_lastStrokePoint(SK_Stroke *stk);
|
||||
|
||||
int sk_detectCutGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
|
||||
void sk_applyCutGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
|
||||
int sk_detectTrimGesture(bContext *C, SK_Gesture *gest, SK_Sketch *sketch);
|
||||
|
@ -78,9 +78,7 @@ void rigid_deform_end(int cancel);
|
||||
|
||||
/* Harmonic Coordinates */
|
||||
|
||||
void mesh_deform_bind(struct Scene *scene,
|
||||
struct MeshDeformModifierData *mmd,
|
||||
float *vertexcos, int totvert, float cagemat[][4]);
|
||||
/* mesh_deform_bind(...) defined in ED_armature.h */
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -98,10 +98,6 @@ void ED_keymap_mesh(struct wmKeyConfig *keyconf);
|
||||
|
||||
|
||||
/* editmesh.c */
|
||||
|
||||
void ED_spacetypes_init(void);
|
||||
void ED_keymap_mesh(struct wmKeyConfig *keyconf);
|
||||
|
||||
void make_editMesh(struct Scene *scene, struct Object *ob);
|
||||
void load_editMesh(struct Scene *scene, struct Object *ob);
|
||||
void remake_editMesh(struct Scene *scene, struct Object *ob);
|
||||
|
@ -104,9 +104,6 @@ struct Object *ED_object_add_type(struct bContext *C, int type, float *loc, floa
|
||||
|
||||
void ED_object_single_users(struct Main *bmain, struct Scene *scene, int full);
|
||||
|
||||
/* cleanup */
|
||||
int object_is_libdata(struct Object *ob);
|
||||
int object_data_is_libdata(struct Object *ob);
|
||||
|
||||
/* object motion paths */
|
||||
void ED_objects_clear_paths(struct bContext *C);
|
||||
|
@ -46,10 +46,19 @@ int ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obed
|
||||
int ED_uvedit_test_silent(struct Object *obedit);
|
||||
int ED_uvedit_test(struct Object *obedit);
|
||||
|
||||
int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf);
|
||||
int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
/* visibility and selection */
|
||||
int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
int uvedit_face_visible_nolocal(struct Scene *scene, struct EditFace *efa);
|
||||
int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf);
|
||||
int uvedit_uv_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_edge_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_edge_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_face_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
void uvedit_face_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
void uvedit_uv_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_uv_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
|
||||
|
||||
int ED_uvedit_nearest_uv(struct Scene *scene, struct Object *obedit, struct Image *ima, float co[2], float uv[2]);
|
||||
|
||||
|
@ -436,9 +436,6 @@ void ui_set_name_menu(uiBut *but, int value);
|
||||
int ui_step_name_menu(uiBut *but, int step);
|
||||
|
||||
struct AutoComplete;
|
||||
struct AutoComplete *autocomplete_begin(const char *startname, int maxlen);
|
||||
void autocomplete_do_name(struct AutoComplete *autocpl, const char *name);
|
||||
void autocomplete_end(struct AutoComplete *autocpl, char *autoname);
|
||||
|
||||
/* interface_panel.c */
|
||||
extern int ui_handler_panel_region(struct bContext *C, struct wmEvent *event);
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_library.h"
|
||||
#include "BKE_main.h"
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_material.h"
|
||||
#include "BKE_texture.h"
|
||||
#include "BKE_report.h"
|
||||
|
@ -49,8 +49,7 @@ int edgetag_shortest_path(Scene *scene, EditMesh *em, EditEdge *source, EditEdge
|
||||
|
||||
extern void free_editvert(EditMesh *em, EditVert *eve);
|
||||
extern void free_editedge(EditMesh *em, EditEdge *eed);
|
||||
extern void free_editface(EditMesh *em, EditFace *efa);
|
||||
void free_editMesh(EditMesh *em);
|
||||
extern void free_editface(EditMesh *em, EditFace *efa);;
|
||||
|
||||
extern void free_vertlist(EditMesh *em, ListBase *edve);
|
||||
extern void free_edgelist(EditMesh *em, ListBase *lb);
|
||||
@ -172,7 +171,6 @@ void MESH_OT_select_nth(struct wmOperatorType *ot);
|
||||
|
||||
|
||||
extern EditEdge *findnearestedge(ViewContext *vc, int *dist);
|
||||
extern void EM_automerge(Scene *scene, Object *obedit, int update);
|
||||
void editmesh_select_by_material(EditMesh *em, int index);
|
||||
void EM_recalc_normal_direction(EditMesh *em, int inside, int select); /* makes faces righthand turning */
|
||||
void EM_select_more(EditMesh *em);
|
||||
|
@ -33,8 +33,9 @@
|
||||
#include "DNA_scene_types.h"
|
||||
#include "DNA_screen_types.h"
|
||||
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_utildefines.h"
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_action.h"
|
||||
#include "BKE_armature.h"
|
||||
#include "BKE_sequencer.h"
|
||||
|
@ -107,7 +107,6 @@ SculptUndoNode *sculpt_undo_get_node(PBVHNode *node);
|
||||
void sculpt_undo_push_begin(const char *name);
|
||||
void sculpt_undo_push_end(void);
|
||||
|
||||
struct MultiresModifierData *sculpt_multires_active(struct Scene *scene, struct Object *ob);
|
||||
int sculpt_modifiers_active(Scene *scene, Object *ob);
|
||||
void sculpt_vertcos_to_key(Object *ob, KeyBlock *kb, float (*vertCos)[3]);
|
||||
|
||||
|
@ -54,9 +54,6 @@ void seq_reset_imageofs(struct SpaceSeq *sseq);
|
||||
|
||||
/* sequencer_edit.c */
|
||||
struct View2D;
|
||||
int seq_single_check(struct Sequence *seq);
|
||||
int seq_tx_get_final_left(struct Sequence *seq, int metaclip);
|
||||
int seq_tx_get_final_right(struct Sequence *seq, int metaclip);
|
||||
void seq_rectf(struct Sequence *seq, struct rctf *rectf);
|
||||
void boundbox_seq(struct Scene *scene, struct rctf *rect);
|
||||
struct Sequence *find_nearest_seq(struct Scene *scene, struct View2D *v2d, int *hand, short mval[2]);
|
||||
@ -65,7 +62,6 @@ void deselect_all_seq(struct Scene *scene);
|
||||
void recurs_sel_seq(struct Sequence *seqm);
|
||||
int event_to_efftype(int event);
|
||||
int seq_effect_find_selected(struct Scene *scene, struct Sequence *activeseq, int type, struct Sequence **selseq1, struct Sequence **selseq2, struct Sequence **selseq3, const char **error_str);
|
||||
struct Sequence *alloc_sequence(struct ListBase *lb, int cfra, int machine);
|
||||
|
||||
/* operator helpers */
|
||||
int sequencer_edit_poll(struct bContext *C);
|
||||
|
@ -44,12 +44,6 @@ struct wmWindowManager;
|
||||
/* text_draw.c */
|
||||
void draw_text_main(struct SpaceText *st, struct ARegion *ar);
|
||||
|
||||
int text_check_bracket(char ch);
|
||||
int text_check_delim(char ch);
|
||||
int text_check_digit(char ch);
|
||||
int text_check_identifier(char ch);
|
||||
int text_check_whitespace(char ch);
|
||||
|
||||
int text_font_width_character(struct SpaceText *st);
|
||||
int text_font_width(struct SpaceText *st, char *str);
|
||||
|
||||
|
@ -38,6 +38,7 @@
|
||||
#include "BLI_math.h"
|
||||
#include "BLI_rand.h"
|
||||
|
||||
#include "BKE_object.h"
|
||||
#include "BKE_context.h"
|
||||
#include "BKE_screen.h"
|
||||
|
||||
|
@ -584,7 +584,6 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char tex
|
||||
|
||||
void constraintNumInput(TransInfo *t, float vec[3]);
|
||||
|
||||
void getConstraintMatrix(TransInfo *t);
|
||||
int isLockConstraint(TransInfo *t);
|
||||
int getConstraintSpaceDimension(TransInfo *t);
|
||||
char constraintModeToChar(TransInfo *t);
|
||||
@ -718,9 +717,6 @@ void applyTransformOrientation(const struct bContext *C, float mat[3][3], char *
|
||||
|
||||
int getTransformOrientation(const struct bContext *C, float normal[3], float plane[3], int activeOnly);
|
||||
|
||||
int createSpaceNormal(float mat[3][3], float normal[3]);
|
||||
int createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3]);
|
||||
|
||||
void freeSlideVerts(TransInfo *t);
|
||||
|
||||
#endif
|
||||
|
@ -47,6 +47,7 @@
|
||||
|
||||
#include "ED_image.h"
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_uvedit.h"
|
||||
|
||||
#include "UI_resources.h"
|
||||
|
||||
|
@ -44,21 +44,6 @@ struct wmOperatorType;
|
||||
#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 EditFace *efa);
|
||||
int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf);
|
||||
|
||||
int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
void uvedit_face_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
void uvedit_face_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf);
|
||||
|
||||
int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_edge_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_edge_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
|
||||
int uvedit_uv_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_uv_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
void uvedit_uv_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i);
|
||||
|
||||
/* geometric utilities */
|
||||
void uv_center(float uv[][2], float cent[2], int quad);
|
||||
|
@ -51,6 +51,7 @@
|
||||
|
||||
#include "ED_image.h"
|
||||
#include "ED_mesh.h"
|
||||
#include "ED_uvedit.h"
|
||||
#include "ED_object.h"
|
||||
#include "ED_screen.h"
|
||||
#include "ED_transform.h"
|
||||
|
@ -39,15 +39,11 @@
|
||||
|
||||
struct ImBuf;
|
||||
|
||||
short imb_addrectImBuf(struct ImBuf * ibuf);
|
||||
short imb_addrectfloatImBuf(struct ImBuf * ibuf);
|
||||
short imb_addplanesImBuf(struct ImBuf *ibuf);
|
||||
|
||||
short imb_addencodedbufferImBuf(struct ImBuf *ibuf);
|
||||
short imb_enlargeencodedbufferImBuf(struct ImBuf *ibuf);
|
||||
|
||||
void imb_freerectImBuf(struct ImBuf *ibuf);
|
||||
void imb_freerectfloatImBuf(struct ImBuf *ibuf);
|
||||
void imb_freeplanesImBuf(struct ImBuf *ibuf);
|
||||
|
||||
short imb_addcmapImBuf(struct ImBuf *ibuf);
|
||||
|
@ -63,8 +63,8 @@ typedef struct PathPoint {
|
||||
#
|
||||
#
|
||||
typedef struct Path {
|
||||
int len;
|
||||
struct PathPoint *data;
|
||||
int len;
|
||||
float totdist;
|
||||
} Path;
|
||||
|
||||
|
@ -80,8 +80,6 @@ extern EnumPropertyItem object_type_curve_items[];
|
||||
|
||||
extern EnumPropertyItem controller_type_items[];
|
||||
|
||||
extern EnumPropertyItem space_type_items[];
|
||||
|
||||
extern EnumPropertyItem keymap_propvalue_items[];
|
||||
|
||||
extern EnumPropertyItem operator_context_items[];
|
||||
|
@ -43,6 +43,4 @@ void validate_layer_name(const struct CustomData *data, int type, char *name, ch
|
||||
struct DerivedMesh *get_cddm(struct Object *ob, struct EditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3]);
|
||||
struct DerivedMesh *get_dm(struct Object *ob, struct EditMesh *em, struct DerivedMesh *dm, float (*vertexCos)[3], int orco);
|
||||
|
||||
void modifier_type_init(struct ModifierTypeInfo *types[]);
|
||||
|
||||
#endif /* MOD_UTIL_H */
|
||||
|
@ -31,7 +31,6 @@
|
||||
#define BPY_EXTERN_H
|
||||
|
||||
extern char bprogname[]; /* holds a copy of argv[0], from creator.c */
|
||||
extern char btempdir[]; /* use this to store a valid temp directory */
|
||||
|
||||
struct Text; /* defined in DNA_text_types.h */
|
||||
struct ID; /* DNA_ID.h */
|
||||
|
@ -460,9 +460,9 @@ enum {
|
||||
|
||||
typedef struct wmReport {
|
||||
struct wmReport *next, *prev;
|
||||
int type;
|
||||
const char *typestr;
|
||||
char *message;
|
||||
int type;
|
||||
} wmReport;
|
||||
|
||||
/* *************** Drag and drop *************** */
|
||||
|
@ -250,8 +250,6 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist)
|
||||
/* in case UserDef was read, we re-initialize all, and do versioning */
|
||||
static void wm_init_userdef(bContext *C)
|
||||
{
|
||||
extern char btempdir[];
|
||||
|
||||
UI_init_userdef();
|
||||
MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
|
||||
sound_init(CTX_data_main(C));
|
||||
|
Loading…
Reference in New Issue
Block a user