diff --git a/scen_edit/view/floating/status_window.lua b/scen_edit/view/floating/status_window.lua index 8f794f8e..48667cfa 100644 --- a/scen_edit/view/floating/status_window.lua +++ b/scen_edit/view/floating/status_window.lua @@ -91,7 +91,11 @@ function StatusWindow:_UpdateMemory() -- We're detecting extensive memory usage here and exiting the current state if critical. -- TODO: Act on it a bit better and automatically clear the undo-redo stack instead of prompting the user to do stuff. local color = SB.conf.STATUS_TEXT_OK_COLOR - if memory > 500 then + + -- If the BIGMEM BAR105 engine build is used, then we dont ever really need to warn the user. + local memoryWarnLevel = 500 + if string.find(Engine.versionFull,"BIGMEM", nil, true) then memoryWarnLevel = 16000 end + if memory > memoryWarnLevel then color = SB.conf.STATUS_TEXT_DANGER_COLOR if not self.warnedTime or os.clock() - self.warnedTime > 10 then self.warnedTime = os.clock() diff --git a/springboard/assets/core/brush_patterns/terrain/eroded_hill.png b/springboard/assets/core/brush_patterns/terrain/eroded_hill.png new file mode 100644 index 00000000..3155588f Binary files /dev/null and b/springboard/assets/core/brush_patterns/terrain/eroded_hill.png differ diff --git a/springboard/assets/core/brush_patterns/terrain/erosion_flue.png b/springboard/assets/core/brush_patterns/terrain/erosion_flue.png new file mode 100644 index 00000000..93959c99 Binary files /dev/null and b/springboard/assets/core/brush_patterns/terrain/erosion_flue.png differ diff --git a/springboard/assets/core/brush_patterns/terrain/perlin_hill.png b/springboard/assets/core/brush_patterns/terrain/perlin_hill.png new file mode 100644 index 00000000..ca81e284 Binary files /dev/null and b/springboard/assets/core/brush_patterns/terrain/perlin_hill.png differ diff --git a/springboard/assets/core/brush_patterns/terrain/terrain_brush_pattern_generator_WM_v1.tmd b/springboard/assets/core/brush_patterns/terrain/terrain_brush_pattern_generator_WM_v1.tmd new file mode 100644 index 00000000..37b9083e Binary files /dev/null and b/springboard/assets/core/brush_patterns/terrain/terrain_brush_pattern_generator_WM_v1.tmd differ diff --git a/springboard/assets/core/brush_patterns/terrain/voronoi1.png b/springboard/assets/core/brush_patterns/terrain/voronoi1.png new file mode 100644 index 00000000..bf291018 Binary files /dev/null and b/springboard/assets/core/brush_patterns/terrain/voronoi1.png differ