sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

small edits noticed when using linked objects, - Make undo string say linked and disallow editing PassIndex and changing the Parent of linked objects.

Browse Source
This commit is contained in:
Campbell Barton 2007-12-28 12:11:45 +00:00
parent aa9aa530fb
commit 1b72bc9792
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/src/buttons_object.c
View File

@ -2322,23 +2322,26 @@ static void object_panel_object(Object *ob)
Group *group; Group *group;
int a, xco, yco=0; int a, xco, yco=0;
short dx= 33, dy= 30; short dx= 33, dy= 30;
int is_libdata = object_is_libdata(ob);
block= uiNewBlock(&curarea->uiblocks, "object_panel_object", UI_EMBOSS, UI_HELV, curarea->win); block= uiNewBlock(&curarea->uiblocks, "object_panel_object", UI_EMBOSS, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Object and Links", "Object", 0, 0, 318, 204)==0) return; if(uiNewPanel(curarea, block, "Object and Links", "Object", 0, 0, 318, 204)==0) return;
uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
/* object name */ /* object name */
uiBlockSetCol(block, TH_BUT_SETTING2); uiBlockSetCol(block, TH_BUT_SETTING2);
uiSetButLock(is_libdata, ERROR_LIBDATA_MESSAGE);
xco= std_libbuttons(block, 10, 180, 0, NULL, 0, ID_OB, 0, &ob->id, NULL, &(G.buts->menunr), B_OBALONE, B_OBLOCAL, 0, 0, B_KEEPDATA); xco= std_libbuttons(block, 10, 180, 0, NULL, 0, ID_OB, 0, &ob->id, NULL, &(G.buts->menunr), B_OBALONE, B_OBLOCAL, 0, 0, B_KEEPDATA);
uiBlockSetCol(block, TH_AUTO); uiBlockSetCol(block, TH_AUTO);
/* parent */ /* parent */
uiSetButLock(is_libdata, ERROR_LIBDATA_MESSAGE);
uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_OBJECTPANELPARENT, "Par:", xco+5, 180, 305-xco, 20, &ob->parent, "Parent Object"); uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_OBJECTPANELPARENT, "Par:", xco+5, 180, 305-xco, 20, &ob->parent, "Parent Object");
/* TODO, check for ob->id.lib */ uiSetButLock(is_libdata, ERROR_LIBDATA_MESSAGE);
but = uiDefButS(block, NUM, B_NOP, "PassIndex:", xco+5, 150, 305-xco, 20, &ob->index, 0.0, 1000.0, 0, 0, "Index # for the IndexOB render pass."); but = uiDefButS(block, NUM, B_NOP, "PassIndex:", xco+5, 150, 305-xco, 20, &ob->index, 0.0, 1000.0, 0, 0, "Index # for the IndexOB render pass.");
uiSetButLock(1, NULL);
uiDefBlockBut(block, add_groupmenu, NULL, "Add to Group", 10,150,150,20, "Add Object to a new Group"); uiDefBlockBut(block, add_groupmenu, NULL, "Add to Group", 10,150,150,20, "Add Object to a new Group");
/* all groups */ /* all groups */

4
source/blender/src/filesel.c
View File

@ -1421,7 +1421,9 @@ static void filesel_execute(SpaceFile *sfile)
} }
do_library_append(sfile); do_library_append(sfile);
BIF_undo_push("Append from file");
BIF_undo_push( ((sfile->flag & FILE_LINK)==0) ? "Append from file" : "Link from file");
allqueue(REDRAWALL, 1); allqueue(REDRAWALL, 1);
} }
else if(filesel_has_func(sfile)) { else if(filesel_has_func(sfile)) {