bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Avoid a sigsev after 44830 when reports is empty, clang compile work

Browse Source
This commit is contained in:
Jens Verwiebe 2012-03-14 12:03:49 +00:00
parent f1da62d31f
commit 639cf31f8a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -267,7 +267,7 @@ if(APPLE)
endif()
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.
# Override the default compiler selection because Blender only compiles with gcc
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")

10
source/blender/blenkernel/intern/report.c
View File

@ -276,11 +276,11 @@ Report *BKE_reports_last_displayable(ReportList *reports)
int BKE_reports_contain(ReportList *reports, ReportType level)
{
Report *report;
for(report=reports->list.first; report; report=report->next)
if(report->type >= level)
return TRUE;
if (reports != NULL) {
for(report=reports->list.first; report; report=report->next)
if(report->type >= level)
return TRUE;
}
return FALSE;
}