Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't use auto vectorization for MinGW-w64. It may be a source for

Browse Source 
trouble. Also fixed a few harmless warnings.
This commit is contained in:
Antony Riakiotakis
2013-04-17 11:16:53 +00:00
parent 14f9f167b2
commit adfa7c8afa
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1246,10 +1246,6 @@ elseif(WIN32)
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing") set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
if(WITH_MINGW64) if(WITH_MINGW64)
#We need to take care though not to have these on debug builds because they may play funky with gdb
if(CMAKE_BUILD_TYPE MATCHES "Release")
set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -ftree-vectorize")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread") set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")

3
source/blender/editors/sculpt_paint/paint_cursor.c
View File

@@ -472,7 +472,8 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush,
quad.xmax = BLI_rcti_size_x(&vc->ar->winrct); quad.xmax = BLI_rcti_size_x(&vc->ar->winrct);
quad.ymax = BLI_rcti_size_y(&vc->ar->winrct); quad.ymax = BLI_rcti_size_y(&vc->ar->winrct);
} }
else if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_STENCIL) { /* Stencil code goes here */
else {
quad.xmin = -brush->stencil_dimension[0]; quad.xmin = -brush->stencil_dimension[0];
quad.ymin = -brush->stencil_dimension[1]; quad.ymin = -brush->stencil_dimension[1];
quad.xmax = brush->stencil_dimension[0]; quad.xmax = brush->stencil_dimension[0];

4
source/blender/editors/transform/transform_conversions.c
View File

@@ -2412,8 +2412,8 @@ static void createTransUVs(bContext *C, TransInfo *t)
BMFace *efa; BMFace *efa;
BMLoop *l; BMLoop *l;
BMIter iter, liter; BMIter iter, liter;
UvElementMap *elementmap; UvElementMap *elementmap = NULL;
char *island_enabled; char *island_enabled = NULL;
int count = 0, countsel = 0, count_rejected = 0; int count = 0, countsel = 0, count_rejected = 0;
int propmode = t->flag & T_PROP_EDIT; int propmode = t->flag & T_PROP_EDIT;
int propconnected = t->flag & T_PROP_CONNECTED; int propconnected = t->flag & T_PROP_CONNECTED;