Avoid a sigsev after 44830 when reports is empty, clang compile work
This commit is contained in:
parent
f1da62d31f
commit
639cf31f8a
@ -267,7 +267,7 @@ if(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${CMAKE_GENERATOR} MATCHES "Xcode")
|
if(${CMAKE_GENERATOR} MATCHES "Xcode")
|
||||||
if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4)
|
if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4) # AND ${XCODE_VERSION} VERSION_LESS 4.3) in the works, needs collada fix for clang and gcc 4.7
|
||||||
# Xcode 4 defaults to the Apple LLVM Compiler.
|
# Xcode 4 defaults to the Apple LLVM Compiler.
|
||||||
# Override the default compiler selection because Blender only compiles with gcc
|
# Override the default compiler selection because Blender only compiles with gcc
|
||||||
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
|
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
|
||||||
|
@ -276,11 +276,11 @@ Report *BKE_reports_last_displayable(ReportList *reports)
|
|||||||
int BKE_reports_contain(ReportList *reports, ReportType level)
|
int BKE_reports_contain(ReportList *reports, ReportType level)
|
||||||
{
|
{
|
||||||
Report *report;
|
Report *report;
|
||||||
|
if (reports != NULL) {
|
||||||
for(report=reports->list.first; report; report=report->next)
|
for(report=reports->list.first; report; report=report->next)
|
||||||
if(report->type >= level)
|
if(report->type >= level)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user