diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-15 22:58:01 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-15 22:58:01 +0400 |
| commit | be1efd74d120068a9a650feddf512b50e5e6c2b8 (patch) | |
| tree | e1232b3256b84165f9194fe5287bf620cf174c18 /source/blender/editors/space_view3d/view3d_toolbar.c | |
| parent | e63d4d2bea06075ef666d613d1136236bb09ae79 (diff) | |
2.5/Sculpt:
* Made sculpt mode local to object.
* This also fixes loading files from 2.4x saved in sculptmode
Touched a lot of things here, let me know if anything breaks
TODO:
* The other paint modes should be converted as well
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_toolbar.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_toolbar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 67d8bc3e5ee..a6317100643 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -190,7 +190,7 @@ char *view3d_context_string(const bContext *C) Object *ob = CTX_data_active_object(C); if(ob && (ob->flag & OB_POSEMODE)) return "pose_mode"; - else if (G.f & G_SCULPTMODE) return "sculpt_mode"; + else if (ob && ob->mode & OB_MODE_SCULPT) return "sculpt_mode"; else if (G.f & G_WEIGHTPAINT) return "weight_paint"; else if (G.f & G_VERTEXPAINT) return "vertex_paint"; else if (G.f & G_TEXTUREPAINT) return "texture_paint"; |