[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43220] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 43219.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Jan 8 12:58:00 CET 2012


Revision: 43220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43220
Author:   kjym3
Date:     2012-01-08 11:57:53 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 43219.

Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c

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

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

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

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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:34011-39896,39898-40096,40098-43040
   + /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:34011-39896,39898-40096,40098-43219

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-01-08 11:57:53 UTC (rev 43220)
@@ -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/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-01-08 11:57:53 UTC (rev 43220)
@@ -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/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py	2012-01-08 11:57:53 UTC (rev 43220)
@@ -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/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2012-01-08 11:57:53 UTC (rev 43220)
@@ -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/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.4.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.4.py	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.4.py	2012-01-08 11:57:53 UTC (rev 43220)
@@ -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/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.5.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.5.py	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Operator.5.py	2012-01-08 11:57:53 UTC (rev 43220)
@@ -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/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst	2012-01-08 10:23:19 UTC (rev 43219)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst	2012-01-08 11:57:53 UTC (rev 43220)
@@ -2,9 +2,9 @@
 Best Practice
 *************
 
-When writing you're own scripts python is great for new developers to pick up and become productive, but you can also pick up odd habits or at least write scripts that are not easy for others to understand.
+When writing your own scripts python is great for new developers to pick up and become productive, but you can also pick up odd habits or at least write scripts that are not easy for others to understand.
 
-For you're own work this is of course fine, but if you want to collaborate with others or have you're work included with blender there are practices we encourage.
+For your own work this is of course fine, but if you want to collaborate with others or have your work included with blender there are practices we encourage.
 
 
 Style Conventions
@@ -83,7 +83,7 @@
 
 Modifying Lists
 ^^^^^^^^^^^^^^^
-In python we can add and remove from a list, This is slower when the list length is modifier, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list