lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-20 09:29:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Will Pearson
2019-06-11 13:41:36 +01:00
parent 541d35604f
commit 30283a8a2c
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opennurbs_subd_fragment.cpp
View File

@@ -1554,7 +1554,7 @@ bool ON_SubDLimitMesh::GetFaceCenterPointAndNormal(
const unsigned int n = fragment->m_grid.m_side_segment_count;
const unsigned int P_dex = fragment->IsCompleteFragment() ? (n*(n + 2) / 2) : 0;
if (P_dex >= (unsigned int)fragment->m_P_count)
return nullptr;
return false;
const double* fragment_P = fragment->m_P + (P_dex * fragment->m_P_stride);
const double* fragment_N = fragment->m_N + (P_dex * fragment->m_N_stride);
if (nullptr != P)

4
opennurbs_system.h
View File

@@ -520,6 +520,10 @@ typedef ON__UINT32 wchar_t;
#include <dirent.h>
#pragma ON_PRAGMA_WARNING_AFTER_DIRTY_INCLUDE
#pragma ON_PRAGMA_WARNING_BEFORE_DIRTY_INCLUDE
#include <uuid/uuid.h>
#pragma ON_PRAGMA_WARNING_AFTER_DIRTY_INCLUDE
#endif
#if defined(ON_COMPILER_CLANG)

3
opennurbs_system_compiler.h
View File

@@ -373,7 +373,8 @@
#define ON_PRAGMA_WARNING_PUSH GCC diagnostic push // Gnu gcc warning state push
#define ON_PRAGMA_WARNING_POP GCC diagnostic pop // Gnu gcc warning state pop
#define ON_PRAGMA_WARNING_DISABLE_GNU(ON_PRAGMA_WARNING_DISABLE_param) GCC diagnostic ignored ON_PRAGMA_WARNING_DISABLE_param // Apple CLang warning disable
// same as for clang, see above
#define ON_CLANG_CONSTRUCTOR_BUG
#if defined(__GNUC__) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 7))
// C++11 noexcept and Rvalue references are in gcc 4.7 and later