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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2006-01-03 05:35:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2006-01-03 05:35:45 +0300
commit5f48930a7514922efe7cebda971bd758e3d6b8cf (patch)
tree90dadc6353fa88e37d4693f8e2a4ccfcfc7f874f /source/blender/include/BIF_editarmature.h
parent80f903ed73878c42b005069c2453c2737275a845 (diff)
Moved Object.Join() into a function of an object.
eg. ret_val = ob.join(objects) Now it dosent depend on the current selection, or change the selection context. Made respective join_* functions return 0 if the join was not mode, 1 when it workes.
Diffstat (limited to 'source/blender/include/BIF_editarmature.h')
-rw-r--r--source/blender/include/BIF_editarmature.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index baf215a4ce2..c8220fabe33 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -87,7 +87,7 @@ void subdivide_armature(void);
void free_editArmature(void);
-void join_armature(void);
+int join_armature(void);
void load_editArmature(void);
void make_bone_parent(void);