diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-07-10 15:00:27 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-07-10 15:00:27 +0400 |
| commit | 227a67e1057f5a8595e1129422fdacfbe17b48c2 (patch) | |
| tree | 1857faede6b8f393abb0a778849e95e95e10fcfa /source/blender/src/interface_panel.c | |
| parent | 65c9ea4588f43b52937f007d88a82a327718e036 (diff) | |
Bug fix #2774
Using linked library files with relative paths, didn't set the correct
relative root... so it only worked with files in the same directory.
ALso fixed the button-lock in material buttons, it didn't allow to see
which materials were linked to the mesh/object.
Diffstat (limited to 'source/blender/src/interface_panel.c')
| -rw-r--r-- | source/blender/src/interface_panel.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/src/interface_panel.c b/source/blender/src/interface_panel.c index 56fef64debd..fae2ce91b86 100644 --- a/source/blender/src/interface_panel.c +++ b/source/blender/src/interface_panel.c @@ -486,7 +486,14 @@ int uiNewPanel(ScrArea *sa, uiBlock *block, char *panelname, char *tabname, int pa= pa->next; } - if(pa==NULL) { + if(pa) { + if(pa->sizex != sizex) { + pa->sizex= sizex; + pa->ofsy+= (pa->sizey - sizey); // check uiNewPanelHeight() + pa->sizey= sizey; + } + } + else { /* new panel */ pa= MEM_callocN(sizeof(Panel), "new panel"); |