--User changes

-Add a palette editor.
 -Add support for reading .ugr/.gradient/.gradients palette files.
 -Allow toggling on spinners whose minimum value is not zero.
 -Allow toggling display of image, affines and grid.
 -Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial.

--Bug fixes
 -cpow2 was wrong.
 -Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3.
 -Use exec() on Apple and show() on all other OSes for dialog boxes.
 -Trying to render a sequence with no frames would crash.
 -Selecting multiple xforms and rotating them would produce the wrong rotation.
 -Better handling when parsing flames using different encoding, such as unicode and UTF-8.
 -Switching between SP/DP didn't reselect the selected flame in the Library tab.

--Code changes
 -Make all types concerning palettes be floats, including PaletteTableWidgetItem.
 -PaletteTableWidgetItem is no longer templated because all palettes are float.
 -Include the source colors for user created gradients.
 -Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems.
 -Split conditional out of accumulation loop on the CPU for better performance.
 -Vectorize summing when doing density filter for better performance.
 -Make all usage of palettes be of type float, double is pointless.
 -Allow palettes to reside in multiple folders, while ensuring only one of each name is added.
 -Refactor some palette path searching code.
 -Make ReadFile() throw and catch an exception if the file operation fails.
 -A little extra safety in foci and foci3D with a call to Zeps().
 -Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac.
 -Fixing missing comma between paths in InitPaletteList().
 -Move Xml and PaletteList classes into cpp to shorten build times when working on them.
 -Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file.
 -Change more NULL to nullptr.

Builds/QtCreator/Ember/Ember.pro

@@ -38,9 +38,12 @@ SOURCES += \
     $$PRJ_SRC_DIR/DllMain.cpp \
     $$PRJ_SRC_DIR/Ember.cpp \
     $$PRJ_SRC_DIR/EmberPch.cpp \
+    $$PRJ_SRC_DIR/EmberToXml.cpp \
+    $$PRJ_SRC_DIR/PaletteList.cpp \
     $$PRJ_SRC_DIR/RendererBase.cpp \
     $$PRJ_SRC_DIR/Renderer.cpp \
-    $$PRJ_SRC_DIR/VariationList.cpp
+    $$PRJ_SRC_DIR/VariationList.cpp \
+    $$PRJ_SRC_DIR/XmlToEmber.cpp
 
 include(deployment.pri)
 qtcAddDeployment()

Builds/QtCreator/Fractorium/Fractorium.pro

@@ -43,6 +43,7 @@ CONFIG(debug, debug|release) {
 
 #For some reason, a Qt project needs to be told to look at itself.
 INCLUDEPATH += $$PRJ_SRC_DIR
+INCLUDEPATH += $$PRJ_SRC_DIR/PaletteEditor
 
 # TODO: Figure out how to build the app bundle correctly.
 # This will build a binary instead of an app bundle.
@@ -53,7 +54,22 @@ target.path = $$BIN_INSTALL_DIR
 INSTALLS += target
 
 palettes.path = $$SHARE_INSTALL_DIR
-palettes.files = $$ASSETS_DIR/flam3-palettes.xml
+palettes.files = $$ASSETS_DIR/flam3-palettes.xml \
+$$ASSETS_DIR/boxtail_pack_02.gradient \
+$$ASSETS_DIR/boxtail_pack_03_triangle.gradient \
+$$ASSETS_DIR/boxtail_pack_04_mineshack.gradient \
+$$ASSETS_DIR/fardareismai_pack_01_variety_number_128.gradient \
+$$ASSETS_DIR/fardareismai_pack_02_b_sides.gradient \
+$$ASSETS_DIR/fardareismai_pack_03_old_and_new.gradient \
+$$ASSETS_DIR/fardareismai_pack_04_hoard.gradient \
+$$ASSETS_DIR/fractaldesire_pack_01.gradient \
+$$ASSETS_DIR/rce_ordinary_pack_01_colornation.gradient \
+$$ASSETS_DIR/tatasz_pack_01.gradient \
+$$ASSETS_DIR/tatasz_pack_02_colder.gradient \
+$$ASSETS_DIR/tatasz_pack_02_dark.gradient \
+$$ASSETS_DIR/tatasz_pack_02_warmer.gradient \
+$$ASSETS_DIR/tatasz_pack_03.gradient
+
 #message(PALETTE INSTALL SOURCE: $$palettes.files)
 INSTALLS += palettes
 
@@ -114,7 +130,12 @@ SOURCES += \
     $$PRJ_SRC_DIR/QssTextEdit.cpp \
     $$PRJ_SRC_DIR/SpinBox.cpp \
     $$PRJ_SRC_DIR/VariationsDialog.cpp \
-	$$PRJ_SRC_DIR/LibraryTreeWidget.cpp
+    $$PRJ_SRC_DIR/LibraryTreeWidget.cpp \
+    $$PRJ_SRC_DIR/PaletteEditor/ColorPanel.cpp \
+    $$PRJ_SRC_DIR/PaletteEditor/ColorPickerWidget.cpp \
+    $$PRJ_SRC_DIR/PaletteEditor/ColorTriangle.cpp \
+    $$PRJ_SRC_DIR/PaletteEditor/GradientColorsView.cpp \
+    $$PRJ_SRC_DIR/PaletteEditor/PaletteEditor.cpp
 
 HEADERS += \
     $$SRC_COMMON_DIR/EmberCommon.h \
@@ -150,7 +171,13 @@ HEADERS += \
     $$PRJ_SRC_DIR/TwoButtonComboWidget.h \
     $$PRJ_SRC_DIR/VariationsDialog.h \
     $$PRJ_SRC_DIR/VariationTreeWidgetItem.h \
-	$$PRJ_SRC_DIR/LibraryTreeWidget.h
+    $$PRJ_SRC_DIR/LibraryTreeWidget.h \
+    $$PRJ_SRC_DIR/PaletteEditor/ColorPanel.h \
+    $$PRJ_SRC_DIR/PaletteEditor/ColorPickerWidget.h \
+    $$PRJ_SRC_DIR/PaletteEditor/ColorTriangle.h \
+    $$PRJ_SRC_DIR/PaletteEditor/GradientArrow.h \
+    $$PRJ_SRC_DIR/PaletteEditor/GradientColorsView.h \
+    $$PRJ_SRC_DIR/PaletteEditor/PaletteEditor.h
 
 FORMS += \
     $$PRJ_SRC_DIR/AboutDialog.ui \
@@ -158,7 +185,8 @@ FORMS += \
     $$PRJ_SRC_DIR/Fractorium.ui \
     $$PRJ_SRC_DIR/OptionsDialog.ui \
     $$PRJ_SRC_DIR/QssDialog.ui \
-    $$PRJ_SRC_DIR/VariationsDialog.ui
+    $$PRJ_SRC_DIR/VariationsDialog.ui \
+    $$PRJ_SRC_DIR/PaletteEditor.ui
 
 OTHER_FILES += \
     $$PRJ_SRC_DIR/Fractorium.aps \

Builds/QtCreator/defaults.pri

@@ -1,5 +1,6 @@
 VERSION = 1.0.0.2
 win32:CONFIG += skip_target_version_ext
+CONFIG += c++14
 #message(PWD: $$absolute_path($$PWD))
 
 #1) Declare the root of all files in this project, everything else will be
@@ -51,6 +52,7 @@ win32 {
 	INCLUDEPATH += /usr/include/glm
 	INCLUDEPATH += /usr/include/tbb
 	INCLUDEPATH += /usr/include/libxml2
+
 #libjpeg and libpng aren't in separate folders, so nothing to add here for them.
 }
 
@@ -90,7 +92,7 @@ macx {
 	LIBS += -L/usr/local/lib# homebrew installs into /usr/local
 }
 
-unix {
+unix:!macx {
 	LIBS += -lGL
 	LIBS += -lOpenCL
 }
@@ -150,6 +152,7 @@ win32 {
 	QMAKE_CXXFLAGS_DEBUG += /Od #Optimization disabled.
 	QMAKE_CXXFLAGS_DEBUG += /D "_DEBUG" #Debug mode.
 	QMAKE_CXXFLAGS_DEBUG += /RTC1 #Basic runtime checks: stack frames and uninitialized variables.
+        QMAKE_CXXFLAGS_DEBUG += /Ob2 #Inline function expansion: any suitable.
 }
 
 !win32 {