Commit 6c0c492d authored by D-AIRY's avatar D-AIRY

n/a

parent 0d4f8a91
......@@ -150,7 +150,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/MP /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/MP /wd4244 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BT_THREADSAFE=1;BULLET_EXPORTS=_declspec(dllexport);_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......
......@@ -150,7 +150,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/MP /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/MP /wd4244 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BT_THREADSAFE=1;BULLET_EXPORTS=_declspec(dllexport);_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......
......@@ -150,7 +150,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/MP /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/MP /wd4244 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BT_THREADSAFE=1;BULLET_EXPORTS=_declspec(dllexport);_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......
......@@ -157,7 +157,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/MP /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/MP /wd4244 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\Extras\Serialize\BulletFileLoader;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BT_THREADSAFE=1;BULLET_EXPORTS=_declspec(dllexport);_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......
......@@ -150,7 +150,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/MP /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/MP /wd4244 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BT_THREADSAFE=1;BULLET_EXPORTS=_declspec(dllexport);_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......
......@@ -2,7 +2,7 @@
#include "btMiniSDF.h"
#include "LinearMath/btAabbUtil2.h"
struct btSdfCollisionShapeInternalData
ATTRIBUTE_ALIGNED16(struct) btSdfCollisionShapeInternalData
{
btVector3 m_localScaling;
btScalar m_margin;
......@@ -14,6 +14,7 @@ struct btSdfCollisionShapeInternalData
{
}
BT_DECLARE_ALIGNED_ALLOCATOR();
};
bool btSdfCollisionShape::initializeSDF(const char* sdfData, int sizeInBytes)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment