diff --git a/2.02g/Source/FormRender.dfm b/2.02g/Source/FormRender.dfm index 4948e4b..4e93f1d 100644 --- a/2.02g/Source/FormRender.dfm +++ b/2.02g/Source/FormRender.dfm @@ -54,8 +54,6 @@ object RenderForm: TRenderForm Top = 330 Width = 409 Height = 13 - Min = 0 - Max = 100 TabOrder = 0 end object btnRender: TButton @@ -280,7 +278,6 @@ object RenderForm: TRenderForm Max = 4 Position = 2 TabOrder = 3 - Wrap = False end end object GroupBox4: TGroupBox @@ -324,7 +321,9 @@ object RenderForm: TRenderForm '64' '128' '256' - '512') + '512' + '1024' + '1536') end object chkLimitMem: TCheckBox Left = 8 @@ -402,7 +401,7 @@ object RenderForm: TRenderForm Width = 327 Height = 21 Style = csDropDownList - ItemHeight = 13 + ItemHeight = 0 TabOrder = 0 OnChange = cmbPresetChange end @@ -422,7 +421,6 @@ object RenderForm: TRenderForm item Width = 50 end> - SimplePanel = False end object SaveDialog: TSaveDialog Left = 368 diff --git a/2.02g/Source/FormRender.pas b/2.02g/Source/FormRender.pas index cb03b18..4a57f08 100644 --- a/2.02g/Source/FormRender.pas +++ b/2.02g/Source/FormRender.pas @@ -243,11 +243,11 @@ begin if (not chkLimitMem.checked) and (ApproxMemory > PhysicalMemory) then begin Application.MessageBox('You do not have enough memory for this render. Please use memory limiting.', 'Apophysis', 48); - exit; +// exit; end; if chkLimitMem.checked and (PhysicalMemory < StrToInt(cbMaxMemory.text)) and (Approxmemory > PhysicalMemory) then begin Application.MessageBox('You do not have enough memory for this render. Please use a lower Maximum memory setting.', 'Apophysis', 48); - exit; +// exit; end; t := txtFilename.Text; if t = '' then @@ -320,13 +320,6 @@ begin MainForm.SaveXMLFlame(cp, ExtractFileName(FileName), renderPath + 'renders.flame'); Renderer := TRenderThread.Create; if chkLimitMem.checked then -(* - if cbMaxMemory.ItemIndex = 0 then Renderer.MaxMem := 32 - else if cbMaxMemory.ItemIndex = 1 then Renderer.MaxMem := 64 - else if cbMaxMemory.ItemIndex = 2 then Renderer.MaxMem := 128 - else if cbMaxMemory.ItemIndex = 3 then Renderer.MaxMem := 256 - else if cbMaxMemory.ItemIndex = 4 then Renderer.MaxMem := 512; -*) Renderer.MaxMem := StrToInt(cbMaxMemory.text); Renderer.OnProgress := OnProgress; Renderer.TargetHandle := RenderForm.Handle; diff --git a/2.02g/Source/ScriptForm.dfm b/2.02g/Source/ScriptForm.dfm index 84a0253..4b48a79 100644 --- a/2.02g/Source/ScriptForm.dfm +++ b/2.02g/Source/ScriptForm.dfm @@ -165,7 +165,7 @@ object ScriptEditor: TScriptEditor 'end;') MarkerList.UseDefaultMarkerImageIndex = False MarkerList.DefaultMarkerImageIndex = -1 - MarkerList.ImageTransparentColor = -1 + MarkerList.ImageTransparentColor = 33554432 PrintOptions.MarginLeft = 0 PrintOptions.MarginRight = 0 PrintOptions.MarginTop = 0 diff --git a/2.02g/Source/ScriptForm.pas b/2.02g/Source/ScriptForm.pas index 62e6dda..be2ab63 100644 --- a/2.02g/Source/ScriptForm.pas +++ b/2.02g/Source/ScriptForm.pas @@ -2709,7 +2709,7 @@ begin Scripter.AddVariable('LimitVibrancy', LimitVibrancy); Scripter.AddLibrary(TMathLibrary); Scripter.AddLibrary(TatMathLibrary); - Scripter.AddLibrary(TatWindowsLibrary); +// Scripter.AddLibrary(TatWindowsLibrary); Scripter.AddLibrary(TatSysUtilsLibrary); Scripter.AddLibrary(TatFileCtrlLibrary); { Nonsense - it's the only way to get the last real