define STBI_NEON on android but disable x86 that's not compatible with the flag on clang

This commit is contained in:
2019-02-27 11:40:46 +01:00
parent 2108441e77
commit d6501293e9
4 changed files with 5 additions and 3 deletions

View File

@@ -95,7 +95,7 @@ android {
// Specifies the ABI configurations of your native
// libraries Gradle should build and package with your APK.
// abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
abiFilters 'armeabi-v7a', 'arm64-v8a'
}
}

View File

@@ -195,7 +195,7 @@ std::vector<std::shared_ptr<Brush>> ABR::compute_brushes(const std::string& path
if (auto roundness = p->get<Descriptor>("roundnessDynamics"))
{
b->m_jitter_aspect = (1.f - roundness->value<UnitFloat>("jitter") * 0.01) * 0.5f + 0.5f;
b->m_jitter_aspect = roundness->value<UnitFloat>("jitter") * 0.01;
}
b->m_tip_randflipx = p->value<Boolean>("flipX");

View File

@@ -415,7 +415,8 @@ void NodePanelBrushPreset::init()
if (!m_current)
return;
int index = m_container->get_child_index(m_current);
m_current->destroy();
m_current->destroy_immediate();
m_container->remove_child(m_current);
if (m_container->m_children.empty())
{
m_current = nullptr;

View File

@@ -52,6 +52,7 @@
#define SHADER_VERSION "#version 300 es\n"
#define PP_OS "android"
#define __block
#define STBI_NEON
#elif _WIN32