mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into travis

Browse Source
This commit is contained in:
Simon Detheridge 2015-07-24 16:31:32 +01:00
commit 3928000f55
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Ember/Variations02.h
View File

@ -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"

4
Source/Fractorium/Fractorium.ui
View File

@ -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">