Regression test fixes:
- New Softbody panel now is named "Soft Body Collision" (instead of II) Also made it start tabbed, and made Fluids panel start untabbed. - Infowindow: skip drawing buttons when width is smaller than 320 pixels.
This commit is contained in:
@@ -323,9 +323,7 @@ static int endwrite(WriteData *wd)
|
||||
|
||||
err= wd->error;
|
||||
writedata_free(wd);
|
||||
/* blender gods may live forever but this parent pointer died in the statement above
|
||||
if(wd->current) printf("undo size %d\n", wd->current->size);
|
||||
*/
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
@@ -2430,9 +2430,10 @@ static void object_softbodies_II(Object *ob)
|
||||
{
|
||||
uiBlock *block;
|
||||
static int val;
|
||||
//uiBut *but;
|
||||
|
||||
block= uiNewBlock(&curarea->uiblocks, "object_softbodies_II", UI_EMBOSS, UI_HELV, curarea->win);
|
||||
if(uiNewPanel(curarea, block, "Soft Body II", "Physics", 651, 0, 318, 204)==0) return;
|
||||
uiNewPanelTabbed("Soft Body", "Physics");
|
||||
if(uiNewPanel(curarea, block, "Soft Body Collision", "Physics", 651, 0, 318, 204)==0) return;
|
||||
|
||||
if(ob->id.lib) uiSetButLock(1, "Can't edit library data");
|
||||
|
||||
@@ -2500,7 +2501,7 @@ static void object_softbodies_II(Object *ob)
|
||||
}
|
||||
uiDefBut(block, LABEL, 0, "",10,10,1,2, NULL, 0.0, 0, 0, 0, ""); /* tell UI we go to 10,10*/
|
||||
}
|
||||
uiBlockEndAlign(block);
|
||||
uiBlockEndAlign(block);
|
||||
}
|
||||
|
||||
static void object_softbodies(Object *ob)
|
||||
@@ -2794,7 +2795,6 @@ static void object_panel_fluidsim(Object *ob)
|
||||
const int objHeight = 20;
|
||||
|
||||
block= uiNewBlock(&curarea->uiblocks, "object_fluidsim", UI_EMBOSS, UI_HELV, curarea->win);
|
||||
uiNewPanelTabbed("Soft Body", "Physics");
|
||||
if(uiNewPanel(curarea, block, "Fluid Simulation", "Physics", 1060, 0, 318, 204)==0) return;
|
||||
|
||||
if(ob->id.lib) uiSetButLock(1, "Can't edit library data");
|
||||
|
||||
@@ -2962,6 +2962,9 @@ void drawinfospace(ScrArea *sa, void *spacedata)
|
||||
glClearColor(col[0], col[1], col[2], 0.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
/* smaller buttons make no sense */
|
||||
if(curarea->winx<320) return;
|
||||
|
||||
if(curarea->winx<=1280.0) {
|
||||
fac= ((float)curarea->winx)/1280.0f;
|
||||
myortho2(0.375f, 1280.375f, 0.375f, curarea->winy/fac + 0.375f);
|
||||
|
||||
Reference in New Issue
Block a user