small edits noticed when using linked objects, - Make undo string say linked and...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Dec 2007 12:11:45 +0000 (12:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Dec 2007 12:11:45 +0000 (12:11 +0000)
source/blender/src/buttons_object.c
source/blender/src/filesel.c

index e5bb4dd8a104fa4e82edcd5b1891492940efb1a2..a65323b0606f062a59c9bdda3738ce357d61ad1a 100644 (file)
@@ -2322,23 +2322,26 @@ static void object_panel_object(Object *ob)
        Group *group;
        int a, xco, yco=0;
        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);
        if(uiNewPanel(curarea, block, "Object and Links", "Object", 0, 0, 318, 204)==0) return;
        
-       uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+       
        
        /* object name */
        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);
        uiBlockSetCol(block, TH_AUTO);
        
        /* 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"); 
        
-       /* 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.");
-
+       
+       uiSetButLock(1, NULL);
        uiDefBlockBut(block, add_groupmenu, NULL, "Add to Group", 10,150,150,20, "Add Object to a new Group");
 
        /* all groups */
index d4e41e56e75aa2a965df23a0d90d2c8c075feee5..d6bbedec2b320f141313b3930bdae12d162f72c7 100644 (file)
@@ -1421,7 +1421,9 @@ static void filesel_execute(SpaceFile *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);
        }
        else if(filesel_has_func(sfile)) {