Revision: 16424
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16424
Author: ton
Date: 2008-09-08 17:15:00 +0200 (Mon, 08 Sep 2008)
Log Message:
-----------
Bugfix #17566
Modifier buttons: now check properly for external lib data, modifiers are
on object only. Only "Apply" is locked now.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_editing.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2008-09-08 13:04:10 UTC
(rev 16423)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-09-08 15:15:00 UTC
(rev 16424)
@@ -1855,6 +1855,8 @@
y -= 18;
if (!isVirtual && (md->type!=eModifierType_Collision)) {
+ uiSetButLock(object_data_is_libdata(ob),
ERROR_LIBDATA_MESSAGE); /* only here obdata, the rest of modifiers is ob level
*/
+
uiBlockBeginAlign(block);
if (md->type==eModifierType_ParticleSystem) {
but = uiDefBut(block, BUT, B_MODIFIER_RECALC,
"Convert", lx,(cy-=19),60,19, 0, 0, 0, 0, 0, "Convert the current
particles to a mesh object");
@@ -1870,6 +1872,8 @@
uiButSetFunc(but, modifiers_copyModifier, ob,
md);
}
uiBlockEndAlign(block);
+
+ uiSetButLock(ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
}
lx = x + 10;
@@ -2552,7 +2556,7 @@
block= uiNewBlock(&curarea->uiblocks, "editing_panel_modifiers",
UI_EMBOSS, UI_HELV, curarea->win);
if( uiNewPanel(curarea, block, "Modifiers", "Editing", 640, 0, 318,
204)==0) return;
- uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+ uiSetButLock((ob && ob->id.lib), ERROR_LIBDATA_MESSAGE);
uiNewPanelHeight(block, 204);
uiDefBlockBut(block, modifiers_add_menu, ob, "Add Modifier", 0, 190,
130, 20, "Add a new modifier");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
