Revision: 38855
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38855
Author: ton
Date: 2011-07-30 15:45:27 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Bugfix #28121
Linked Library objects or object->data should not allow to go
to sculptmode. Also cleaned up mode menu with invalid entries then.
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2011-07-30
14:24:28 UTC (rev 38854)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2011-07-30
15:45:27 UTC (rev 38855)
@@ -301,7 +301,7 @@
int ED_operator_object_active_editable_mesh(bContext *C)
{
Object *ob = ED_object_active_context(C);
- return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag &
OB_RESTRICT_VIEW) && ob->type == OB_MESH);
+ return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag &
OB_RESTRICT_VIEW) && ob->type == OB_MESH && !(((ID *)ob->data)->lib));
}
int ED_operator_object_active_editable_font(bContext *C)
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c
2011-07-30 14:24:28 UTC (rev 38854)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c
2011-07-30 15:45:27 UTC (rev 38855)
@@ -280,7 +280,8 @@
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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
