[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43211] branches/vgroup_modifiers: merged from trunk (-r43033:43210)

Bastien Montagne montagne29 at wanadoo.fr
Sat Jan 7 16:56:41 CET 2012


Revision: 43211
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43211
Author:   mont29
Date:     2012-01-07 15:56:33 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
merged from trunk (-r43033:43210)

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43033

Modified Paths:
--------------
    branches/vgroup_modifiers/CMakeLists.txt
    branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py
    branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py
    branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py
    branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.4.py
    branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.5.py
    branches/vgroup_modifiers/doc/python_api/rst/info_best_practice.rst
    branches/vgroup_modifiers/doc/python_api/rst/info_quickstart.rst
    branches/vgroup_modifiers/doc/python_api/rst/info_tips_and_tricks.rst
    branches/vgroup_modifiers/intern/cycles/app/cycles_server.cpp
    branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_object.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp
    branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp
    branches/vgroup_modifiers/intern/cycles/device/device.cpp
    branches/vgroup_modifiers/intern/cycles/device/device.h
    branches/vgroup_modifiers/intern/cycles/device/device_cpu.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_cuda.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_intern.h
    branches/vgroup_modifiers/intern/cycles/device/device_memory.h
    branches/vgroup_modifiers/intern/cycles/device/device_multi.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_network.cpp
    branches/vgroup_modifiers/intern/cycles/device/device_opencl.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.cl
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.cu
    branches/vgroup_modifiers/intern/cycles/kernel/kernel.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_displace.h
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_optimized.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/kernel_types.h
    branches/vgroup_modifiers/intern/cycles/render/buffers.cpp
    branches/vgroup_modifiers/intern/cycles/render/mesh_displace.cpp
    branches/vgroup_modifiers/intern/cycles/render/session.cpp
    branches/vgroup_modifiers/intern/cycles/render/session.h
    branches/vgroup_modifiers/intern/cycles/render/tile.cpp
    branches/vgroup_modifiers/intern/ghost/CMakeLists.txt
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/vgroup_modifiers/intern/tools/dump_rna2xml.py
    branches/vgroup_modifiers/release/scripts/modules/animsys_refactor.py
    branches/vgroup_modifiers/release/scripts/modules/rna_prop_ui.py
    branches/vgroup_modifiers/release/scripts/modules/sys_info.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/anim.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/clip.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/wm.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_object.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_particle.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_image.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_logic.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf.c
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_particle.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_sound.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/bvhutils.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/constraint.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/depsgraph.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/movieclip.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/seqeffects.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/sequencer.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/sound.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
    branches/vgroup_modifiers/source/blender/blenlib/intern/edgehash.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_ipo_utils.c
    branches/vgroup_modifiers/source/blender/editors/armature/editarmature.c
    branches/vgroup_modifiers/source/blender/editors/armature/poselib.c
    branches/vgroup_modifiers/source/blender/editors/armature/poseobject.c
    branches/vgroup_modifiers/source/blender/editors/include/ED_object.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface_draw.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_data.c
    branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
    branches/vgroup_modifiers/source/blender/editors/object/object_group.c
    branches/vgroup_modifiers/source/blender/editors/object/object_shapekey.c
    branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
    branches/vgroup_modifiers/source/blender/editors/physics/dynamicpaint_ops.c
    branches/vgroup_modifiers/source/blender/editors/physics/particle_object.c
    branches/vgroup_modifiers/source/blender/editors/render/render_shading.c
    branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c
    branches/vgroup_modifiers/source/blender/editors/screen/screendump.c
    branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_texture.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_templates.c
    branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_snap.c
    branches/vgroup_modifiers/source/blender/gpu/GPU_buffers.h
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_buffers.c
    branches/vgroup_modifiers/source/blender/gpu/intern/gpu_material.c
    branches/vgroup_modifiers/source/blender/imbuf/IMB_imbuf.h
    branches/vgroup_modifiers/source/blender/imbuf/intern/anim_movie.c
    branches/vgroup_modifiers/source/blender/imbuf/intern/divers.c
    branches/vgroup_modifiers/source/blender/makesdna/DNA_constraint_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
    branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
    branches/vgroup_modifiers/source/blender/makesrna/RNA_enum_types.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/makesrna.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_constraint.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_define.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_property.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_screen.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_tracking.c
    branches/vgroup_modifiers/source/blender/modifiers/SConscript
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_explode.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_remesh.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c
    branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.c
    branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.c
    branches/vgroup_modifiers/source/blender/render/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/render/extern/include/RE_pipeline.h
    branches/vgroup_modifiers/source/blender/render/intern/include/renderpipeline.h
    branches/vgroup_modifiers/source/blender/render/intern/source/external_engine.c
    branches/vgroup_modifiers/source/blender/render/intern/source/imagetexture.c
    branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
    branches/vgroup_modifiers/source/blender/render/intern/source/rayshade.c
    branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c
    branches/vgroup_modifiers/source/blender/render/intern/source/rendercore.c
    branches/vgroup_modifiers/source/blender/render/intern/source/zbuf.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
    branches/vgroup_modifiers/source/creator/creator.c
    branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/vgroup_modifiers/source/gameengine/GameLogic/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.cpp

Added Paths:
-----------
    branches/vgroup_modifiers/release/scripts/modules/rna_xml.py
    branches/vgroup_modifiers/source/blender/render/intern/include/render_result.h
    branches/vgroup_modifiers/source/blender/render/intern/source/render_result.c

Property Changed:
----------------
    branches/vgroup_modifiers/
    branches/vgroup_modifiers/source/blender/editors/space_outliner/


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
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,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43033
   + /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:38694-38739,38741-39198,39200-39651,39653-39988,39990-43210

Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/CMakeLists.txt	2012-01-07 15:56:33 UTC (rev 43211)
@@ -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)
@@ -269,8 +270,8 @@
 	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
 endif()
 
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
-	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
+	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
 endif()
 
 # python module, needs some different options
@@ -584,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")
@@ -699,8 +711,8 @@
 
 		add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
 
-		set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
-		set(CMAKE_C_FLAGS   "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_C_FLAGS   "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
 
 		if(CMAKE_CL_64)
 			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -1014,9 +1026,13 @@
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
-
+		
 		set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
 
+		## DISABLE - causes linking errors 
+		## for re-distrobution, so users dont need mingw installed
+		# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")
+
 	endif()
 
 	# used in many places so include globally, like OpenGL
@@ -1393,8 +1409,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)
@@ -1405,8 +1424,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)
@@ -1541,6 +1563,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)
 

Modified: branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py	2012-01-07 15:56:33 UTC (rev 43211)
@@ -190,6 +190,10 @@
 
 PLATFORM_LINKFLAGS = ['-Xlinker', '--stack=2097152']
 
+## DISABLED, causes linking errors!
+## for re-distrobution, so users dont need mingw installed
+# PLATFORM_LINKFLAGS += ["-static-libgcc", "-static-libstdc++"]
+
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g', '-D_DEBUG']
 

Modified: branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py	2012-01-07 15:56:33 UTC (rev 43211)
@@ -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'
 
@@ -185,7 +185,7 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
 CXXFLAGS = ['/EHsc']
 BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
 

Modified: branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/build_files/scons/config/win64-vc-config.py	2012-01-07 15:56:33 UTC (rev 43211)
@@ -61,7 +61,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'
 
@@ -190,7 +190,7 @@
 CXX = 'cl.exe'
 
 CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W0', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W1', '/Gd', '/we4013', '/wd4018', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
 

Modified: branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.4.py
===================================================================
--- branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.4.py	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.4.py	2012-01-07 15:56:33 UTC (rev 43211)
@@ -22,7 +22,7 @@
     my_string = bpy.props.StringProperty(name="String Value")
 
     def execute(self, context):
-        print()
+        print("Test", self)
         return {'FINISHED'}
 
     def invoke(self, context, event):

Modified: branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.5.py
===================================================================
--- branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.5.py	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/doc/python_api/examples/bpy.types.Operator.5.py	2012-01-07 15:56:33 UTC (rev 43211)
@@ -31,6 +31,7 @@
 
     def execute(self, context):
         context.object.location.x = self.value / 100.0
+        return {'FINISHED'}
 
     def modal(self, context, event):
         if event.type == 'MOUSEMOVE':  # Apply

Modified: branches/vgroup_modifiers/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/info_best_practice.rst	2012-01-06 22:55:15 UTC (rev 43210)
+++ branches/vgroup_modifiers/doc/python_api/rst/info_best_practice.rst	2012-01-07 15:56:33 UTC (rev 43211)
@@ -2,9 +2,9 @@
 Best Practice
 *************
 

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list