diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-01-31 13:43:21 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-01-31 13:43:21 +0300 |
| commit | 538d93eb865c64166ae62e081a2a15347d712a54 (patch) | |
| tree | 3bb4edb9b642d38172f6c72945fc15b7f60ef34c /source/blender/src/header_view3d.c | |
| parent | abec067761cdb8245f473dc723c8d744ed4a802c (diff) | |
Bugfix for Join Armatures:
When Join Armatures was called from the menu (Object -> Join Objects) problems were being cause by the use of BASEACT, causing some armatures to disappear and not be joined.
Diffstat (limited to 'source/blender/src/header_view3d.c')
| -rw-r--r-- | source/blender/src/header_view3d.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 67da3f3d0c8..5d35d44f9c1 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -2396,15 +2396,17 @@ extern ListBase session_list; static void do_view3d_edit_objectmenu(void *arg, int event) { +#ifdef WITH_VERSE + struct VerseSession *session=NULL; + /* needed to check for valid selected objects */ Base *base=NULL; Object *ob=NULL; -#ifdef WITH_VERSE - struct VerseSession *session=NULL; -#endif - + base= BASACT; if (base) ob= base->object; +#endif + switch(event) { |