diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-10 18:32:03 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-10 18:32:03 +0400 |
| commit | 465c3b82fa8320c0366eaa72b2319c8b42f9c8f1 (patch) | |
| tree | 9d458a8e0fdd9f12f3cb03eeeab246ca2523a707 /source/blender/editors/space_view3d/view3d_header.c | |
| parent | 16deef9e79721d3525244eaef11190b5ff0fd58b (diff) | |
| parent | 22694c993a7e32767db4719e9fa37e93445b66a8 (diff) | |
merge with trunk r39216
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_header.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index a4e1081d6cd..907f0826de9 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -282,7 +282,8 @@ static char *view3d_modeselect_pup(Scene *scene) str += sprintf(str, formatstr, _("Object Mode"), OB_MODE_OBJECT, ICON_OBJECT_DATA); - if(ob==NULL) return string; + if(ob==NULL || ob->data==NULL) return string; + if(ob->id.lib || ((ID *)ob->data)->lib) return string; /* if active object is editable */ if ( ((ob->type == OB_MESH) |