[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56107] trunk/blender: Don' t use auto vectorization for MinGW-w64.

[Antony Riakiotakis]

Revision: 56107
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56107
Author:   psy-fi
Date:     2013-04-17 11:16:53 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
Don't use auto vectorization for MinGW-w64. It may be a source for
trouble. Also fixed a few harmless warnings.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt        2013-04-17 09:27:23 UTC (rev 56106)
+++ trunk/blender/CMakeLists.txt        2013-04-17 11:16:53 UTC (rev 56107)
@@ -1246,10 +1246,6 @@
                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")
                        

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c    
2013-04-17 09:27:23 UTC (rev 56106)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c    
2013-04-17 11:16:53 UTC (rev 56107)
@@ -472,7 +472,8 @@
                        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];

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c      
2013-04-17 09:27:23 UTC (rev 56106)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c      
2013-04-17 11:16:53 UTC (rev 56107)
@@ -2412,8 +2412,8 @@
        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs