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
path: root/source/blender/include
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/include')
-rw-r--r--source/blender/include/BDR_editcurve.h1
-rw-r--r--source/blender/include/BDR_editobject.h4
-rw-r--r--source/blender/include/BIF_butspace.h2
-rw-r--r--source/blender/include/BIF_editarmature.h29
-rw-r--r--source/blender/include/BIF_editconstraint.h4
-rw-r--r--source/blender/include/BIF_editfont.h1
-rw-r--r--source/blender/include/BIF_editika.h39
-rw-r--r--source/blender/include/BIF_outliner.h2
-rw-r--r--source/blender/include/BIF_poseobject.h19
-rw-r--r--source/blender/include/butspace.h6
-rwxr-xr-xsource/blender/include/transform.h6
11 files changed, 30 insertions, 83 deletions
diff --git a/source/blender/include/BDR_editcurve.h b/source/blender/include/BDR_editcurve.h
index 18b5d1a53d0..461eaa81318 100644
--- a/source/blender/include/BDR_editcurve.h
+++ b/source/blender/include/BDR_editcurve.h
@@ -92,7 +92,6 @@ void add_primitiveNurb(int type);
void clear_tilt(void);
void clever_numbuts_curve(void);
int bezt_compare (const void *e1, const void *e2);
-void curve_changes_other_objects(struct Object *ob);
extern void undo_push_curve(char *name);
diff --git a/source/blender/include/BDR_editobject.h b/source/blender/include/BDR_editobject.h
index 5d2a6f48e9a..f67fc40ec4d 100644
--- a/source/blender/include/BDR_editobject.h
+++ b/source/blender/include/BDR_editobject.h
@@ -53,8 +53,6 @@ void make_vertex_parent(void);
int test_parent_loop(struct Object *par, struct Object *ob);
void make_parent(void);
-void make_displists_by_parent(struct Object *ob);
-
void exit_editmode(int freedata);
void check_editmode(int type);
void enter_editmode(void);
@@ -106,8 +104,6 @@ void select_select_keys(void);
int vergbaseco(const void *a1, const void *a2);
void auto_timeoffs(void);
void texspace_edit(void);
-void first_base(void);
-void make_displists_by_obdata(void *obdata);
void flip_subdivison(struct Object *ob, int);
void mirrormenu(void);
diff --git a/source/blender/include/BIF_butspace.h b/source/blender/include/BIF_butspace.h
index 437e0a2791d..0b2997f3317 100644
--- a/source/blender/include/BIF_butspace.h
+++ b/source/blender/include/BIF_butspace.h
@@ -43,7 +43,7 @@ extern void do_butspace(unsigned short event);
extern void redraw_test_buttons(struct Object *new);
/* buttons_editing.c */
-extern void rename_bone_ext(char *oldname, char *newname);
+extern void validate_editbonebutton_cb(void *bonev, void *namev);
/* buts->mainb old */
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index df6d74cd036..77472ede8cf 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -45,7 +45,6 @@ typedef struct EditBone
void *temp; /* Used to store temporary data */
char name[32];
- char oldname[32];
float roll; /* Roll along axis. We'll ultimately use the axis/angle method
for determining the transformation matrix of the bone. The axis
is tail-head while roll provides the angle. Refer to Graphics
@@ -56,8 +55,6 @@ typedef struct EditBone
/* All joints are considered to have zero rotation with respect to
their parents. Therefore any rotations specified during the
animation are automatically relative to the bones' rest positions*/
- short sHead[2];
- short sTail[2];
int flag;
int parNr; /* Used for retrieving values from the menu system */
@@ -67,12 +64,7 @@ typedef struct EditBone
for pose element, rather than trying to use the existing transObject
system?
*/
- float dist, weight;
- float loc[3], dloc[3];
- float size[3], dsize[3];
- float rot[3], drot[3];
- float quat[4], dquat[4];
- float obmat[4][4];
+ float dist, weight, length;
short boneclass;
@@ -85,8 +77,7 @@ void add_primitiveArmature(int type);
void apply_rot_armature (struct Object *ob, float mat[3][3]);
void clear_armature(struct Object *ob, char mode);
-void clever_numbuts_armature (void);
-void clever_numbuts_posearmature (void);
+
void delete_armature(void);
void deselectall_armature(void);
void deselectall_posearmature (int test);
@@ -97,6 +88,8 @@ void join_armature(void);
void load_editArmature(void);
char* make_bone_menu(struct bArmature *arm);
void make_bone_parent(void);
+void clear_bone_parent(void);
+
void make_editArmature(void);
void make_trans_bones (char mode);
void mousepose_armature(void);
@@ -109,7 +102,7 @@ void unique_editbone_name (char* name);
void attach_bone_to_parent(EditBone *bone);
void attach_bone_to_parent_cb(void *bonev, void *arg2_unused);
-struct Bone *get_first_selected_bone (void);
+
void auto_align_armature(void);
void create_vgroups_from_armature(Object *ob, Object *par);
@@ -123,9 +116,15 @@ int ik_chain_looper(Object *ob, struct Bone *bone, void *data,
int (*bone_func)(Object *, struct Bone *, void *));
int is_delay_deform(void);
-#define BONESEL_TIP 0x08000000
-#define BONESEL_ROOT 0x04000000
-#define BONESEL_BONE (BONESEL_TIP|BONESEL_ROOT)
+void undo_push_armature(char *name);
+void armature_bone_rename(struct bArmature *arm, char *oldname, char *newname);
+
+
+#define BONESEL_ROOT 0x02000000
+#define BONESEL_TIP 0x04000000
+#define BONESEL_BONE 0x08000000
+#define BONESEL_ANY (BONESEL_TIP|BONESEL_ROOT|BONESEL_BONE)
+
#define BONESEL_NOSEL 0x80000000 /* Indicates a negative number */
#endif
diff --git a/source/blender/include/BIF_editconstraint.h b/source/blender/include/BIF_editconstraint.h
index 8d983fe32e0..af7765cf1b2 100644
--- a/source/blender/include/BIF_editconstraint.h
+++ b/source/blender/include/BIF_editconstraint.h
@@ -54,8 +54,8 @@ void add_constraint_to_object(struct bConstraint *con, struct Object *ob);
void add_constraint_to_client(struct bConstraint *con);
struct ListBase *get_constraint_client_channels (int forcevalid);
struct ListBase *get_constraint_client(char *name, short *clienttype, void** clientdata);
-int test_constraints (struct Object *owner, const char *substring, int disable);
-void test_scene_constraints (void);
+
+void object_test_constraints(struct Object *owner);
char *get_con_subtarget_name(struct bConstraint *constraint,
struct Object *target);
diff --git a/source/blender/include/BIF_editfont.h b/source/blender/include/BIF_editfont.h
index aa52c87e461..372630da8e2 100644
--- a/source/blender/include/BIF_editfont.h
+++ b/source/blender/include/BIF_editfont.h
@@ -50,7 +50,6 @@ void txt_export_to_objects(struct Text *text);
void undo_push_font(char *);
void load_3dtext_fs(char *);
void add_lorem(void);
-void text_makedisplist(struct Object *ob);
/**
* @attention The argument is discarded. It is there for
diff --git a/source/blender/include/BIF_editika.h b/source/blender/include/BIF_editika.h
deleted file mode 100644
index 9160d7e4baf..00000000000
--- a/source/blender/include/BIF_editika.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License. See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-struct Object;
-void draw_ika(struct Object *ob, int sel);
-void draw_ika_nrs(struct Object *ob, int type);
-int extrude_ika(struct Object *ob, int add);
-void delete_skeleton(void);
-void make_skeleton(void);
-
diff --git a/source/blender/include/BIF_outliner.h b/source/blender/include/BIF_outliner.h
index f306cdbb1b2..448a6be5884 100644
--- a/source/blender/include/BIF_outliner.h
+++ b/source/blender/include/BIF_outliner.h
@@ -63,6 +63,8 @@ typedef struct TreeElement {
#define TSE_HOOKS_BASE 9
#define TSE_HOOK 10
#define TSE_SCRIPT_BASE 11
+#define TSE_POSE_BASE 12
+#define TSE_POSE_CHANNEL 13
/* button events */
#define OL_NAMEBUTTON 1
diff --git a/source/blender/include/BIF_poseobject.h b/source/blender/include/BIF_poseobject.h
index 872584edfe9..9859a2598ed 100644
--- a/source/blender/include/BIF_poseobject.h
+++ b/source/blender/include/BIF_poseobject.h
@@ -39,15 +39,10 @@
void enter_posemode(void);
/**
- * Provides the current object the opportunity to specify
- * which channels to key in the current pose (if any).
- * If an object provides its own filter, it must clear
- * then POSE_KEY flags of unwanted channels, as well as
- * setting the flags for desired channels.
- *
- * Default behaviour is to key all channels.
- */
-void filter_pose_keys(void);
+* If bones are selected, it sets the flags
+*/
+struct Object;
+void set_pose_keys(struct Object *ob);
/**
* Deactivates posemode
@@ -55,11 +50,7 @@ void filter_pose_keys(void);
*/
void exit_posemode(int freedata);
-/**
- * Removes unreferenced pose channels from an object
- * @param ob Object to check
- */
-void collect_pose_garbage(struct Object *ob);
+void pose_special_editmenu(void);
#endif
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index 8cc6ad4519d..5ebdd4d5a1a 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -137,6 +137,8 @@ void test_idbutton_cb(void *namev, void *arg2_unused);
#define B_ARMATUREPANEL1 1009
#define B_ARMATUREPANEL2 1010
#define B_OBJECTPANELPARENT 1011
+#define B_OBJECTPANEL 1012
+#define B_ARMATUREPANEL3 1013
/* *********************** */
#define B_LAMPBUTS 1200
@@ -300,6 +302,7 @@ enum {
/* *********************** */
#define B_COMMONEDITBUTS 2049
+#define B_CHANGEDEP 2002
#define B_MATWICH 2003
#define B_MATNEW 2004
#define B_MATDEL 2005
@@ -405,10 +408,7 @@ enum {
#define B_STYLETOSEL 2212
/* *********************** */
-#define B_IKABUTS 2400
-#define B_IKASETREF 2301
-#define B_IKARECALC 2302
/* *********************** */
#define B_CAMBUTS 2500
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index c7c6ceb3cc3..69e9f1d919c 100755
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -246,9 +246,9 @@ int PushPull(TransInfo *t, short mval[2]);
void initCrease(TransInfo *t);
int Crease(TransInfo *t, short mval[2]);
-/* exported from transform.c */
+/*********************** transform_conversions.c ********** */
struct ListBase;
-void count_bone_select(TransInfo *t, struct ListBase *lb, int *counter);
+void count_bone_select(TransInfo *t, struct ListBase *lb, int do_it);
/*********************** exported from transform_manipulator.c ********** */
struct ScrArea;
@@ -260,7 +260,7 @@ void createTransData(TransInfo *t);
void sort_trans_data_dist(TransInfo *t);
void clear_trans_object_base_flags(void);
void add_tdi_poin(float *poin, float *old, float delta);
-void special_aftertrans_update(char mode, int flip, short canceled, int keyflags);
+void special_aftertrans_update(char mode, int flip, short canceled);
/*********************** Constraints *****************************/
void getConstraintMatrix(TransInfo *t);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 01:46:00 +0300