diff --git a/2.10/Source/Editor.pas b/2.10/Source/Editor.pas index 191cecc..2849441 100644 --- a/2.10/Source/Editor.pas +++ b/2.10/Source/Editor.pas @@ -1069,6 +1069,7 @@ begin if (nmin = nmax) and (nmin = t) then begin for j := 0 to Transforms-1 do modWeights[j] := cp.xform[t].modWeights[j]; + if noPlot then noPlot := cp.xform[t].noPlot; end; end; // check for single "from" links diff --git a/2.10/Source/Global.pas b/2.10/Source/Global.pas index 57518d2..3c7935c 100644 --- a/2.10/Source/Global.pas +++ b/2.10/Source/Global.pas @@ -165,7 +165,7 @@ var { For random gradients } MinNodes, MaxNodes, MinHue, MaxHue, MinSat, MaxSat, MinLum, MaxLum: integer; - ReferenceMode: integer;//FixedReference: boolean; + //ReferenceMode: integer; BatchSize: Integer; Compatibility: integer; //0 = original, 1 = Drave's Favorites: TStringList; diff --git a/2.10/Source/Options.dfm b/2.10/Source/Options.dfm index deadda1..9a1afa1 100644 --- a/2.10/Source/Options.dfm +++ b/2.10/Source/Options.dfm @@ -405,7 +405,7 @@ object OptionsForm: TOptionsForm end object rgReferenceMode: TRadioGroup Left = 160 - Top = 4 + Top = 76 Width = 145 Height = 69 Caption = 'Reference Triangle' @@ -415,10 +415,11 @@ object OptionsForm: TOptionsForm 'Proportional' 'Wandering (old-style)') TabOrder = 1 + Visible = False end object GroupBox21: TGroupBox Left = 160 - Top = 77 + Top = 4 Width = 145 Height = 65 Caption = 'Editor defaults' @@ -508,58 +509,58 @@ object OptionsForm: TOptionsForm Caption = 'Rendering' TabOrder = 0 object lblSampleDensity: TLabel - Left = 56 + Left = 59 Top = 19 - Width = 41 + Width = 38 Height = 13 Alignment = taRightJustify Caption = 'Quality:' end object lblGamma: TLabel - Left = 56 + Left = 58 Top = 43 - Width = 41 + Width = 39 Height = 13 Alignment = taRightJustify Caption = 'Gamma:' end object lblBrightness: TLabel - Left = 40 + Left = 43 Top = 67 - Width = 57 + Width = 54 Height = 13 Alignment = taRightJustify Caption = 'Brightness:' end object lblVibrancy: TLabel - Left = 48 + Left = 52 Top = 91 - Width = 49 + Width = 45 Height = 13 Alignment = taRightJustify Caption = 'Vibrancy:' end object lblOversample: TLabel - Left = 32 + Left = 36 Top = 139 - Width = 65 + Width = 61 Height = 13 Alignment = taRightJustify Caption = 'Oversample:' end object lblFilterRadius: TLabel - Left = 32 + Left = 34 Top = 163 - Width = 65 + Width = 63 Height = 13 Alignment = taRightJustify Caption = 'Filter Radius:' end object lblGammaThreshold: TLabel - Left = 8 + Left = 10 Top = 115 - Width = 89 - Height = 14 + Width = 87 + Height = 13 Alignment = taRightJustify Caption = 'Gamma threshold:' WordWrap = True diff --git a/2.10/Source/Options.pas b/2.10/Source/Options.pas index 2205c0e..d465ec8 100644 --- a/2.10/Source/Options.pas +++ b/2.10/Source/Options.pas @@ -328,7 +328,7 @@ begin { Editor } - rgReferenceMode.ItemIndex := ReferenceMode; +// rgReferenceMode.ItemIndex := ReferenceMode; chkUseXFormColor.checked := UseTransformColors; chkHelpers.Checked := HelpersEnabled; chkExtendedEdit.Checked := ExtEditEnabled; @@ -465,7 +465,7 @@ begin // Editor - ReferenceMode := rgReferenceMode.ItemIndex; +// ReferenceMode := rgReferenceMode.ItemIndex; UseTransformColors := chkUseXFormColor.checked; HelpersEnabled := chkHelpers.Checked; ShowAllXforms := chkShowAllXforms.Checked; diff --git a/2.10/Source/Regstry.pas b/2.10/Source/Regstry.pas index 63f8067..d0c05f1 100644 --- a/2.10/Source/Regstry.pas +++ b/2.10/Source/Regstry.pas @@ -397,9 +397,9 @@ begin randGradientFile := '' end; - if Registry.ValueExists('ReferenceMode') then - ReferenceMode := Registry.ReadInteger('ReferenceMode') - else ReferenceMode := 0; +// if Registry.ValueExists('ReferenceMode') then +// ReferenceMode := Registry.ReadInteger('ReferenceMode') +// else ReferenceMode := 0; if Registry.ValueExists('RotationMode') then MainForm_RotationMode := Registry.ReadInteger('RotationMode') @@ -620,7 +620,7 @@ begin end else begin - ReferenceMode := 0; +// ReferenceMode := 0; MainForm_RotationMode := 0; EditPrevQual := 1; MutatePrevQual := 1; @@ -1101,7 +1101,7 @@ begin Registry.WriteInteger('SymmetryNVars', SymmetryNVars); // Registry.WriteInteger('VariationOptions', VariationOptions); // Registry.WriteInteger('VariationOptions2', VariationOptions shr 32); - Registry.WriteInteger('ReferenceMode', ReferenceMode); +// Registry.WriteInteger('ReferenceMode', ReferenceMode); Registry.WriteInteger('RotationMode', MainForm_RotationMode); Registry.WriteInteger('MinNodes', MinNodes); Registry.WriteInteger('MinHue', MinHue); @@ -1139,7 +1139,7 @@ begin Registry.WriteBool('SaveIncompleteRenders', SaveIncompleteRenders); Registry.WriteBool('ShowRenderStats', ShowRenderStats); - Registry.WriteBool('LowerRenderPriority', LowerRenderPriority); +// Registry.WriteBool('LowerRenderPriority', LowerRenderPriority); Registry.WriteInteger('NrTreads', NrTreads); Registry.WriteInteger('UseNrThreads', UseNrThreads); diff --git a/2.10/Source/ScriptForm.pas b/2.10/Source/ScriptForm.pas index 616b70f..c083f29 100644 --- a/2.10/Source/ScriptForm.pas +++ b/2.10/Source/ScriptForm.pas @@ -550,14 +550,14 @@ end; procedure TScriptEditor.GetFixedReference(AMachine: TatVirtualMachine); begin with AMachine do - ReturnOutPutArg(ReferenceMode = 0); + ReturnOutPutArg(true); //ReferenceMode = 0); end; procedure TScriptEditor.SetFixedReference(AMachine: TatVirtualMachine); begin - with AMachine do - if GetInputArgAsBoolean(0) then ReferenceMode := 0 - else ReferenceMode := 1; +// with AMachine do +// if GetInputArgAsBoolean(0) then ReferenceMode := 0 +// else ReferenceMode := 1; end; procedure TScriptEditor.GetSampleDensity(AMachine: TatVirtualMachine);