Differential D9213 Diff 24175 graphics/qt5-3d/files/patch-src_3rdparty_assimp_code_BlenderTessellator.cpp
Changeset View
Changeset View
Standalone View
Standalone View
graphics/qt5-3d/files/patch-src_3rdparty_assimp_code_BlenderTessellator.cpp
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- src/3rdparty/assimp/code/BlenderTessellator.cpp.orig 2016-02-25 20:42:21 UTC | |||||
+++ src/3rdparty/assimp/code/BlenderTessellator.cpp | |||||
rakuco: Context? Was this sent upstream? Does it come from upstream? | |||||
Not Done Inline ActionsThis should not be here. We switched to using multimedia/assimp with the update to 5.6.1. Again something that never made it back to area51 :/ tcberner: This should not be here. We switched to using multimedia/assimp with the update to 5.6.1. Again… | |||||
@@ -375,8 +375,8 @@ void BlenderTessellatorP2T::ReferencePoi | |||||
// ------------------------------------------------------------------------------------------------ | |||||
// Yes this is filthy... but we have no choice | |||||
#define OffsetOf( Class, Member ) ( static_cast< unsigned int >( \ | |||||
- reinterpret_cast<uint8_t*>(&( reinterpret_cast< Class* >( NULL )->*( &Class::Member ) )) - \ | |||||
- static_cast<uint8_t*>(NULL) ) ) | |||||
+ reinterpret_cast<uint8_t*>(&( static_cast< Class* >( NULL )->*( &Class::Member ) )) - \ | |||||
+ static_cast<uint8_t*>(NULL) ) ) | |||||
inline PointP2T& BlenderTessellatorP2T::GetActualPointStructure( p2t::Point& point ) const | |||||
{ |
Context? Was this sent upstream? Does it come from upstream?