diff --git a/mandelbulber2/deploy/NEWS b/mandelbulber2/deploy/NEWS index 54437a522..ee8ee7c4e 100644 --- a/mandelbulber2/deploy/NEWS +++ b/mandelbulber2/deploy/NEWS @@ -1,8 +1,11 @@ Version history +v2.13-2 +- UI: fixed bug: using mouse wheel on spinbox with dial could cause program crash + v2.13-1 (April 2018) -- Mesh Export: Fixed bug: Mesh Export disn't provide cMaterial data. It caused crash when fractal color was calculated -- OpenCL: SSAO used double precission constants and variables +- Mesh Export: Fixed bug: Mesh Export didn't provide cMaterial data. It caused crash when fractal color was calculated +- OpenCL: SSAO used double precision constants and variables v2.13 (March 2018) - Fractals: renamed all fabs() to abs() in all formula UI diff --git a/mandelbulber2/deploy/README b/mandelbulber2/deploy/README index 6fd30b79b..6c4e47261 100644 --- a/mandelbulber2/deploy/README +++ b/mandelbulber2/deploy/README @@ -1,5 +1,5 @@ - MANDELBULBER 2.13-1 + MANDELBULBER 2.13-2 1. What is Mandelbulber ----------------------- diff --git a/mandelbulber2/deploy/README-osx.txt b/mandelbulber2/deploy/README-osx.txt index c6956db4f..0dc09c0b4 100644 --- a/mandelbulber2/deploy/README-osx.txt +++ b/mandelbulber2/deploy/README-osx.txt @@ -1,5 +1,5 @@ - MANDELBULBER 2.11 + MANDELBULBER 2.13-2 1. What is Mandelbulber ----------------------- diff --git a/mandelbulber2/deploy/README-win32.txt b/mandelbulber2/deploy/README-win32.txt index 2f1f1e10e..d60d02396 100644 --- a/mandelbulber2/deploy/README-win32.txt +++ b/mandelbulber2/deploy/README-win32.txt @@ -1,5 +1,5 @@ - MANDELBULBER 2.13-1 + MANDELBULBER 2.13-2 1. What is Mandelbulber ----------------------- diff --git a/mandelbulber2/formula/ui/fractal_amazing_surf_mod2.ui b/mandelbulber2/formula/ui/fractal_amazing_surf_mod2.ui index b2a4dc1f0..6472e3e79 100644 --- a/mandelbulber2/formula/ui/fractal_amazing_surf_mod2.ui +++ b/mandelbulber2/formula/ui/fractal_amazing_surf_mod2.ui @@ -1,13 +1,13 @@ - amazing_surf_mod2 + Form 0 0 1321 - 6977 + 4095 @@ -466,7 +466,7 @@ <html><head/><body><p>Cpixel is CVector3 c = ( c.x, c.y, c.z). It is each original point (pixel) in 3D space where the iteration starts from, ( c = original z for each point .) It is commonly found in formula structures z = f(z) + c.</p><p>The Cpixel multiplier effectively scales this point &quot;c&quot;.</p><p>This transform allows the swapping of the order of the &quot;CVector3 c&quot; components before being multiplied by &quot;CVector3 z&quot; components.</p></body></html> - Invert C co&nstant + &Invert C constant true @@ -659,7 +659,7 @@ - &Fold Tweak + Fo&ld Tweak true @@ -1731,7 +1731,7 @@ - Standard &Functions Enabled + Standard Functions Ena&bled true @@ -2298,19 +2298,6 @@ offset: - - - - -18000 - - - 18000 - - - true - - - @@ -2322,32 +2309,6 @@ offset: - - - -18000 - - - 18000 - - - true - - - - - - - -18000 - - - 18000 - - - true - - - - @@ -2395,7 +2356,7 @@ offset: - + @@ -2423,7 +2384,7 @@ offset: - + @@ -2468,7 +2429,7 @@ offset: - aux.color &components + a&ux.color components true @@ -3052,9 +3013,6 @@ offset: groupCheck_mandelbox_main_rotation_enabled spinboxInt_transf_start_iterations_R spinboxInt_transf_stop_iterations_R - dial3_mandelbox_rotation_main_x - dial3_mandelbox_rotation_main_y - dial3_mandelbox_rotation_main_z spinboxd3_mandelbox_rotation_main_x spinboxd3_mandelbox_rotation_main_y spinboxd3_mandelbox_rotation_main_z diff --git a/mandelbulber2/msvc/mandelbulber2.rc b/mandelbulber2/msvc/mandelbulber2.rc index 7d2c850ad..1f16af885 100644 --- a/mandelbulber2/msvc/mandelbulber2.rc +++ b/mandelbulber2/msvc/mandelbulber2.rc @@ -61,8 +61,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,1,0 - PRODUCTVERSION 2,13,1,0 + FILEVERSION 2,13,2,0 + PRODUCTVERSION 2,13,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "Mandelbulber Team" VALUE "FileDescription", "Mandelbulber generates three-dimensional fractals." - VALUE "FileVersion", "2.13.1.0" + VALUE "FileVersion", "2.13.2.0" VALUE "InternalName", "mandelbulber2.exe" VALUE "LegalCopyright", "Copyright (C) 2018 Mandelbulber Team" VALUE "OriginalFilename", "mandelbulber2.exe" VALUE "ProductName", "Mandelbulber" - VALUE "ProductVersion", "2.13.1.0" + VALUE "ProductVersion", "2.13.2.0" END END BLOCK "VarFileInfo" diff --git a/mandelbulber2/qt/frame_slider_popup.cpp b/mandelbulber2/qt/frame_slider_popup.cpp index 117bab81d..e52cf479e 100644 --- a/mandelbulber2/qt/frame_slider_popup.cpp +++ b/mandelbulber2/qt/frame_slider_popup.cpp @@ -93,7 +93,9 @@ void cFrameSliderPopup::sliderReleased() { if (!integerMode) { + blockSignals(true); ui->slider->setValue(500); + blockSignals(false); } } @@ -143,12 +145,16 @@ void cFrameSliderPopup::SetDialMode(int scale, double val) void cFrameSliderPopup::slotUpdateValue(int val) { + blockSignals(true); ui->slider->setValue(val); + blockSignals(false); } void cFrameSliderPopup::slotUpdateValue(double val) { + blockSignals(true); ui->dial->setValue(val * dialScale); + blockSignals(false); } void cFrameSliderPopup::slotDialValueChanged(int val) diff --git a/mandelbulber2/src/system.hpp b/mandelbulber2/src/system.hpp index 217d899bb..e8cedb999 100644 --- a/mandelbulber2/src/system.hpp +++ b/mandelbulber2/src/system.hpp @@ -35,8 +35,8 @@ #ifndef MANDELBULBER2_SRC_SYSTEM_HPP_ #define MANDELBULBER2_SRC_SYSTEM_HPP_ -#define MANDELBULBER_VERSION 2.131 -#define MANDELBULBER_VERSION_STRING "2.13-1" +#define MANDELBULBER_VERSION 2.132 +#define MANDELBULBER_VERSION_STRING "2.13-2" #define TO_STRING(a) #a #ifdef _WIN32 /* WINDOWS */