From d6b112dd326c688d290fe382166409dc6785b669 Mon Sep 17 00:00:00 2001
From: Person <Person@QCP2>
Date: Sun, 5 Mar 2017 08:32:58 -0800
Subject: [PATCH] --Bug fixes:  -Xaos has been wrong this entire time on the
 GPU because it was not selecting from the unweighted distributions on the
 very first iteration when fusing.

---
 Source/EmberCL/IterOpenCLKernelCreator.cpp | 2 +-
 Source/Fractorium/Fractorium.ui            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/EmberCL/IterOpenCLKernelCreator.cpp b/Source/EmberCL/IterOpenCLKernelCreator.cpp
index 9f83d47..461c31c 100644
--- a/Source/EmberCL/IterOpenCLKernelCreator.cpp
+++ b/Source/EmberCL/IterOpenCLKernelCreator.cpp
@@ -280,7 +280,7 @@ string IterOpenCLKernelCreator<T>::CreateIterKernelString(const Ember<T>& ember,
 	   "		firstPoint.m_Y = MwcNextNeg1Pos1(&mwc);\n"
 	   "		firstPoint.m_Z = 0.0;\n"
 	   "		firstPoint.m_ColorX = MwcNext01(&mwc);\n"
-	   "		firstPoint.m_LastXfUsed = 0;\n"
+	   "		firstPoint.m_LastXfUsed = 0 - 1;\n"//This ensures the first iteration chooses from the unweighted distribution array, all subsequent will choose from the weighted ones.
 	   "	}\n"
 	   "	else\n"
 	   "	{\n"
diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui
index 8168622..9506551 100644
--- a/Source/Fractorium/Fractorium.ui
+++ b/Source/Fractorium/Fractorium.ui
@@ -3060,7 +3060,7 @@
           <enum>QTabWidget::Triangular</enum>
          </property>
          <property name="currentIndex">
-          <number>1</number>
+          <number>2</number>
          </property>
          <widget class="QWidget" name="XformColorTab">
           <property name="sizePolicy">
@@ -3398,7 +3398,7 @@
              <item row="0" column="1">
               <widget class="QPushButton" name="ToggleColorIndicesButton">
                <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1, alternating&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="text">
                 <string>Toggle Indices</string>
@@ -3408,7 +3408,7 @@
              <item row="1" column="0">
               <widget class="QPushButton" name="RandomColorSpeedButton">
                <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color speed values to random numbers between 0 and 1, inclusive&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="text">
                 <string>Random Color Speed</string>
@@ -3418,7 +3418,7 @@
              <item row="1" column="1">
               <widget class="QPushButton" name="ToggleColorSpeedButton">
                <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color indices to 0 or 1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set all xform color speed values to 0 or 1, alternating&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="text">
                 <string>Toggle Color Speed</string>