Orange: monday merger with bf-blender (loadsa bugfixes).

ALso: a bit tidying up in editaction.c and python Object.c

3 files changed, 6 insertions, 1 deletions

diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h
index 74ffbca1b9b..7471e80baa9 100644
--- a/source/blender/include/BIF_editaction.h
+++ b/source/blender/include/BIF_editaction.h
@@ -78,6 +78,10 @@ void transform_meshchannel_keys(char mode, struct Key *key);
 struct Key *get_action_mesh_key(void);
 int get_nearest_key_num(struct Key *key, short *mval, float *x);
 void set_snap_actionchannels(void);
+void up_sel_action(void);
+void down_sel_action(void);
+void top_sel_action(void);
+void bottom_sel_action(void);
 
 /* Handles */
 void sethandles_meshchannel_keys(int code, struct Key *key);
diff --git a/source/blender/include/BIF_editconstraint.h b/source/blender/include/BIF_editconstraint.h
index 2ab72a304c2..5db034f57de 100644
--- a/source/blender/include/BIF_editconstraint.h
+++ b/source/blender/include/BIF_editconstraint.h
@@ -51,6 +51,7 @@ struct bConstraintChannel *get_active_constraint_channel(struct Object *ob);
 void object_test_constraints(struct Object *owner);
 
 void add_constraint(int only_IK);
+void ob_clear_constraints(void);
 
 char *get_con_subtarget_name(struct bConstraint *con, struct Object *target);
 
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index d026d61b16f..70fecc83bad 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -158,7 +158,7 @@ typedef enum {
 	ICON_BPIBFOLDER_ERR,
 	ICON_UGLY_GREEN_RING,
 	ICON_GHOST,
-	ICON_BLANK32,
+	ICON_SORTBYEXT,
 	ICON_BLANK33,
 	ICON_VERTEXSEL,
 	ICON_EDGESEL,