diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-01-08 03:24:59 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-01-08 03:24:59 +0300 |
commit | c6b6910c16c987372e8f88d5c84c9bcd52944e3e (patch) | |
tree | 03c9c96f0cee7771b062405c76a49b4df1cdbb8d /source | |
parent | ff1db49e343f700b2e779f4fb9aebb0055bc34bc (diff) |
2.5
Fix compile errors
Remove stubs that duplicate code and set armature lib priority correctly (needs to link with mesh)
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/armature/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript index 95f20404c4b..e4e42a27b36 100644 --- a/source/blender/editors/armature/SConscript +++ b/source/blender/editors/armature/SConscript @@ -8,4 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' incs += ' ../../gpu ../../makesrna #/intern/opennl/extern' -env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [], libtype=['core'], priority=[100] ) +env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [], libtype=['core'], priority=[44] ) diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index bb9c3328cb5..57ca206e7dd 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -102,9 +102,7 @@ static void countall() {} static void vertexgroup_select_by_name() {} static void deselect_actionchannels() {} static void add_vert_to_defgroup() {} -#define WEIGHT_REPLACE 0 static void create_dverts() {} -static int mesh_get_x_mirror_vert() {return 0;} static void select_actionchannel_by_name() {} /* ************* XXX *************** */ |