diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea22951f674..e505a686717 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1246,10 +1246,6 @@ elseif(WIN32) set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing") 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(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread") diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index abc16c6973c..7525085fd53 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -472,7 +472,8 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush, quad.xmax = BLI_rcti_size_x(&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.ymin = -brush->stencil_dimension[1]; quad.xmax = brush->stencil_dimension[0]; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0e44230b326..747fae93ace 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2412,8 +2412,8 @@ static void createTransUVs(bContext *C, TransInfo *t) BMFace *efa; BMLoop *l; BMIter iter, liter; - UvElementMap *elementmap; - char *island_enabled; + UvElementMap *elementmap = NULL; + char *island_enabled = NULL; int count = 0, countsel = 0, count_rejected = 0; int propmode = t->flag & T_PROP_EDIT; int propconnected = t->flag & T_PROP_CONNECTED; |