diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-04-15 13:20:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-15 13:20:13 +0400 |
| commit | 2147e74bc5974424f17abbd52d57f0f6a6d0861a (patch) | |
| tree | ff64d518964ff612d07ec5276644d25caacf45d8 /source/blender/src/outliner.c | |
| parent | 6bb327badc63d65afe459e092059bf1d9c20b075 (diff) | |
made sculpt axis locking use local/global space (using the transform space)
also added some checks for sculpt mixing with other modes (was possible to mix sculpt+posemode)
Diffstat (limited to 'source/blender/src/outliner.c')
| -rw-r--r-- | source/blender/src/outliner.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index b9c1725233f..d66118ae1fc 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -1302,6 +1302,8 @@ static int outliner_open_back(SpaceOops *soops, TreeElement *te) return retval; } +/* This is not used anywhere at the moment */ +#if 0 static void outliner_open_reveal(SpaceOops *soops, ListBase *lb, TreeElement *teFind, int *found) { TreeElement *te; @@ -1324,7 +1326,7 @@ static void outliner_open_reveal(SpaceOops *soops, ListBase *lb, TreeElement *te } } } - +#endif void outliner_one_level(struct ScrArea *sa, int add) { @@ -2652,7 +2654,7 @@ static void object_delete_cb(TreeElement *te, TreeStoreElem *tsep, TreeStoreElem if(G.obedit==base->object) exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); if(base==BASACT) { - G.f &= ~(G_VERTEXPAINT+G_TEXTUREPAINT+G_WEIGHTPAINT); + G.f &= ~(G_VERTEXPAINT+G_TEXTUREPAINT+G_WEIGHTPAINT+G_SCULPTMODE); setcursor_space(SPACE_VIEW3D, CURSOR_STD); } |