mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0.0.19 Release

Browse Source
This commit is contained in:
Person
2020-03-13 18:56:42 -07:00
parent a2e60bdaa5
commit be86f1084c
4 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Source/EmberCommon/EmberCommonPch.h
View File

@ -64,28 +64,28 @@
#endif
#ifdef __APPLE__
#include <OpenEXR/ImfRgbaFile.h>
#include <OpenEXR/ImfStringAttribute.h>
#include <OpenEXR/half.h>
#include <OpenEXR/ImfChannelList.h>
#include <OpenEXR/ImfOutputFile.h>
#define ENUM_DYLD_BOOL
#include <mach-o/dyld.h>
#include <OpenEXR/ImfRgbaFile.h>
#include <OpenEXR/ImfStringAttribute.h>
#include <OpenEXR/half.h>
#include <OpenEXR/ImfChannelList.h>
#include <OpenEXR/ImfOutputFile.h>
#define ENUM_DYLD_BOOL
#include <mach-o/dyld.h>
#define _MM_DENORMALS_ZERO_MASK 0x0040
#define _MM_DENORMALS_ZERO_ON 0x0040
#define _MM_DENORMALS_ZERO_OFF 0x0000
#define _MM_DENORMALS_ZERO_MASK 0x0040
#define _MM_DENORMALS_ZERO_ON 0x0040
#define _MM_DENORMALS_ZERO_OFF 0x0000
#define _MM_SET_DENORMALS_ZERO_MODE(mode) \
_mm_setcsr((_mm_getcsr() & ~_MM_DENORMALS_ZERO_MASK) | (mode))
#define _MM_GET_DENORMALS_ZERO_MODE() \
(_mm_getcsr() & _MM_DENORMALS_ZERO_MASK)
#define _MM_SET_DENORMALS_ZERO_MODE(mode) \
_mm_setcsr((_mm_getcsr() & ~_MM_DENORMALS_ZERO_MASK) | (mode))
#define _MM_GET_DENORMALS_ZERO_MODE() \
(_mm_getcsr() & _MM_DENORMALS_ZERO_MASK)
#else
#include <ImfRgbaFile.h>
#include <ImfStringAttribute.h>
#include <ImfChannelList.h>
#include <ImfOutputFile.h>
#include <half.h>
#include <ImfRgbaFile.h>
#include <ImfStringAttribute.h>
#include <ImfChannelList.h>
#include <ImfOutputFile.h>
#include <half.h>
#endif
using namespace Imf;

10
Source/Fractorium/Fractorium.ui
View File

@ -912,7 +912,7 @@
<string>Center X</string>
</property>
<property name="toolTip">
<string>Horizontal center of the image. Drag with the middle mouse button to pan.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Horizontal center of the image. Drag with the middle mouse button, or the right mouse button while holding Shift to pan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</item>
<item row="2" column="1">
@ -925,7 +925,7 @@
<string>Center Y</string>
</property>
<property name="toolTip">
<string>Vertical center of the image. Drag with the middle mouse button to pan.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vertical center of the image. Drag with the middle mouse button, or the right mouse button while holding Shift to pan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</item>
<item row="3" column="1">
@ -938,7 +938,7 @@
<string>Scale</string>
</property>
<property name="toolTip">
<string>Zoom level of the image. Adjust by scrolling the mouse wheel or dragging with the right mouse button.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zoom level of the image. Adjust by scrolling the mouse wheel, pressing &amp;lt; or &amp;gt;, or dragging with the right mouse button.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</item>
<item row="4" column="1">
@ -8252,10 +8252,10 @@
<normaloff>:/Fractorium/Icons/folder-visiting-4.png</normaloff>:/Fractorium/Icons/folder-visiting-4.png</iconset>
</property>
<property name="text">
<string>Open Examples</string>
<string>Open examples</string>
</property>
<property name="toolTip">
<string>Open Examples</string>
<string>Open examples</string>
</property>
</action>
<action name="ActionExit">