From 328a413c59e84d58b3d914aac8b17943ebdfc4f8 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <simon@highlyillogical.org>
Date: Fri, 24 Jul 2015 11:06:14 +0100
Subject: [PATCH 1/2] Fix opencl crash in 'hole' variation

---
 Source/Ember/Variations02.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Ember/Variations02.h b/Source/Ember/Variations02.h
index 45df4af..52f45a5 100644
--- a/Source/Ember/Variations02.h
+++ b/Source/Ember/Variations02.h
@@ -2726,7 +2726,7 @@ public:
 		string inside = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
 
 		ss << "\t{\n"
-		   << "\t\treal_t r, delta = pow(precalcAtanyx / M_PI + 1, " << a << ");\n"
+		   << "\t\treal_t r, delta = pow(precalcAtanyx / (real_t)M_PI + 1, " << a << ");\n"
 		   << "\n"
 		   << "\t\tif (" << inside << " != 0)\n"
 		   << "\t\t	r = xform->m_VariationWeights[" << varIndex << "] * delta / (precalcSqrtSumSquares + delta);\n"

From 24ce030c2f02d561e519055f45e8e0f7fe4f0ad2 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <simon@highlyillogical.org>
Date: Fri, 24 Jul 2015 15:52:37 +0100
Subject: [PATCH 2/2] Change hotkeys for copy/paste selected xforms

Apple users will very much expect command-Q to exit the app.

I'm not sure if it's possible to change these just for mac... People may be used to them being on Q/W on Windows?
---
 Source/Fractorium/Fractorium.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Fractorium/Fractorium.ui b/Source/Fractorium/Fractorium.ui
index 763b6b6..e43db50 100644
--- a/Source/Fractorium/Fractorium.ui
+++ b/Source/Fractorium/Fractorium.ui
@@ -6510,7 +6510,7 @@ SpinBox
     <string>Copy selected xforms to the clipboard</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Q</string>
+    <string>Ctrl+D</string>
    </property>
   </action>
   <action name="ActionPasteSelectedXforms">
@@ -6521,7 +6521,7 @@ SpinBox
     <string>Paste copied xforms into the current flame</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+W</string>
+    <string>Ctrl+S</string>
    </property>
   </action>
   <action name="ActionResetWorkspace">