[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43133] branches/soc-2011-onion-uv-tools: merge with trunk 43131

Antony Riakiotakis kalast at gmail.com
Wed Jan 4 17:22:54 CET 2012


Revision: 43133
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43133
Author:   psy-fi
Date:     2012-01-04 16:22:53 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
merge with trunk 43131

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/SConstruct
    branches/soc-2011-onion-uv-tools/build_files/cmake/macros.cmake
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_quickstart.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-onion-uv-tools/intern/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/SConscript
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device.h
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device_multi.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel.cl
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel.cu
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_displace.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-onion-uv-tools/intern/cycles/render/mesh_displace.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/soc-2011-onion-uv-tools/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2011-onion-uv-tools/intern/tools/dump_rna2xml.py
    branches/soc-2011-onion-uv-tools/release/datafiles/blender_icons.png
    branches/soc-2011-onion-uv-tools/release/scripts/modules/animsys_refactor.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_prop_ui.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/sys_info.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/edgehash.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poselib.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/datafiles/blender_icons.png.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_object.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_icons.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_group.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/particle_object.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filesel.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_FontObject.cpp

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/intern/dualcon/
    branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_xml.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/tracking_track_color/object.py
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_remesh.c

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42472
/trunk/blender:39665-43005
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39665-43131

Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt	2012-01-04 16:19:50 UTC (rev 43132)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt	2012-01-04 16:22:53 UTC (rev 43133)
@@ -156,6 +156,7 @@
 
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
+	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	OFF)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
 	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
 	mark_as_advanced(WITH_XDG_USER_DIRS)
@@ -169,6 +170,7 @@
 option(WITH_MOD_SMOKE        	"Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH        	"Enable Remesh Modifier" ON)
 option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
 mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
@@ -583,6 +585,17 @@
 		if(WITH_X11_XINPUT)
 			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
 		endif()
+
+		if(WITH_X11_XF86VMODE)
+			# XXX, why dont cmake make this available?
+			FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
+			mark_as_advanced(X11_Xxf86vmode_LIB)
+			if(X11_Xxf86vmode_LIB)
+				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xxf86vmode_LIB}")
+			else()
+				set(WITH_X11_XF86VMODE OFF)
+			endif()
+		endif()
 	endif()
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -765,22 +778,27 @@
 				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
+			
+			set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
 
 			set(OPENCOLLADA_LIBRARIES
-				${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
-				${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
-				${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
-				${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
-				${LIBDIR}/opencollada/lib/MathMLSolver.lib
-				${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
-				${LIBDIR}/opencollada/lib/xml2.lib
-				${LIBDIR}/opencollada/lib/buffer.lib
-				${LIBDIR}/opencollada/lib/ftoa.lib
-				${LIBDIR}/opencollada/lib/UTF.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
+				${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
+				${OPENCOLLADA_LIBPATH}/xml2.lib
+				${OPENCOLLADA_LIBPATH}/buffer.lib
+				${OPENCOLLADA_LIBPATH}/ftoa.lib
+				${OPENCOLLADA_LIBPATH}/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${LIBDIR}/opencollada/lib/pcre.lib
+				${OPENCOLLADA_LIBPATH}/pcre.lib
 			)
+			
+			unset(OPENCOLLADA_LIBPATH)
+			
 		endif()
 
 		if(WITH_CODEC_FFMPEG)
@@ -798,18 +816,8 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			if(MSVC90)
-				set(MSVC_LIB _vs2008)
-				set(MSVC_INC)
-			elseif(MSVC10)
-				set(MSVC_LIB _vs2010)
-				set(MSVC_INC _vs2010)
-			else()
-				set(MSVC_LIB msvc)
-				set(MSVC_INC)
-			endif()
-			set(OPENEXR ${LIBDIR}/openexr)
-			set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+			set_lib_path(OPENEXR "openexr")
+			set_lib_path(OPENEXR_LIBPATH "openexr/lib")
 			set(OPENEXR_LIBRARIES
 				${OPENEXR_LIBPATH}/Iex.lib
 				${OPENEXR_LIBPATH}/Half.lib
@@ -817,7 +825,7 @@
 				${OPENEXR_LIBPATH}/Imath.lib
 				${OPENEXR_LIBPATH}/IlmThread.lib
 			)
-			set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+			set_lib_path(OPENEXR_INCUDE "openexr/include")
 			set(OPENEXR_INCLUDE_DIRS
 				${OPENEXR_INCUDE}
 				${OPENEXR_INCUDE}/IlmImf
@@ -844,9 +852,9 @@
 		if(WITH_PYTHON)
 			# normally cached but not since we include them with blender
 			set(PYTHON_VERSION 3.2) # CACHE STRING)
-			set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
-			set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
-
+			set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
+			set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
+			
 			# uncached vars
 			set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
 			set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
@@ -879,7 +887,7 @@
 			set(OPENIMAGEIO ${LIBDIR}/openimageio)
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
-			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+			set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
@@ -1397,8 +1405,11 @@
 
 	# disable because it gives warnings for printf() & friends.
 	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 
+	if(NOT APPLE)
+		ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+	endif()
+
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
@@ -1409,8 +1420,11 @@
 	# flags to undo strict flags
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
 
+	if(NOT APPLE)
+		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+	endif()
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -1431,11 +1445,9 @@
 if(MSVC10)
 	if(WITH_IMAGE_OPENEXR)
 		message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
-		set(WITH_IMAGE_OPENEXR OFF)
 	endif()
 	if(WITH_OPENCOLLADA)
 		message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
-		set(WITH_OPENCOLLADA OFF)
 	endif()
 endif()
 
@@ -1547,6 +1559,7 @@
 
 	info_cfg_text("System Options:")
 	info_cfg_option(WITH_INSTALL_PORTABLE)
+	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
 	info_cfg_option(WITH_BUILTIN_GLEW)
 
@@ -1577,6 +1590,7 @@
 
 	info_cfg_text("Modifiers:")
 	info_cfg_option(WITH_MOD_BOOLEAN)
+	info_cfg_option(WITH_MOD_REMESH)
 	info_cfg_option(WITH_MOD_DECIMATE)
 	info_cfg_option(WITH_MOD_FLUID)
 	info_cfg_option(WITH_MOD_OCEANSIM)

Modified: branches/soc-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct	2012-01-04 16:19:50 UTC (rev 43132)
+++ branches/soc-2011-onion-uv-tools/SConstruct	2012-01-04 16:22:53 UTC (rev 43133)
@@ -264,6 +264,7 @@
     target_env_defs['WITH_BF_OCEANSIM'] = False
     target_env_defs['WITH_BF_DECIMATE'] = False
     target_env_defs['WITH_BF_BOOLEAN'] = False
+    target_env_defs['WITH_BF_REMESH'] = False
     target_env_defs['WITH_BF_PYTHON'] = False
     target_env_defs['WITH_BF_3DMOUSE'] = False
     

Modified: branches/soc-2011-onion-uv-tools/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/macros.cmake	2012-01-04 16:19:50 UTC (rev 43132)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/macros.cmake	2012-01-04 16:22:53 UTC (rev 43133)
@@ -665,3 +665,16 @@
 	endif()
 endfunction()
 
+macro(set_lib_path
+		lvar
+		lproj)
+
+	
+	if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj})
+		set(${lvar} ${LIBDIR}/vc2010/${lproj})
+	else()
+		set(${lvar} ${LIBDIR}/${lproj})
+	endif()
+
+
+endmacro()
\ No newline at end of file

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py	2012-01-04 16:19:50 UTC (rev 43132)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py	2012-01-04 16:22:53 UTC (rev 43133)
@@ -57,7 +57,7 @@
 BF_OPENEXR = LIBDIR + '/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
 

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py	2012-01-04 16:19:50 UTC (rev 43132)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py	2012-01-04 16:22:53 UTC (rev 43133)
@@ -61,7 +61,7 @@
 BF_OPENEXR = LIBDIR + '/openexr'

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list