Revision: 43131
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43131
Author: nazgul
Date: 2012-01-04 15:42:07 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Merging r43025 through r43129 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43025
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43129
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-tomato/intern/cycles/blender/blender_mesh.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/device/device.cpp
branches/soc-2011-tomato/intern/cycles/device/device.h
branches/soc-2011-tomato/intern/cycles/device/device_cpu.cpp
branches/soc-2011-tomato/intern/cycles/device/device_cuda.cpp
branches/soc-2011-tomato/intern/cycles/device/device_multi.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cl
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel.cu
branches/soc-2011-tomato/intern/cycles/kernel/kernel.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_displace.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_optimized.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/render/mesh_displace.cpp
branches/soc-2011-tomato/intern/dualcon/intern/Projections.h
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/soc-2011-tomato/intern/tools/dump_rna2xml.py
branches/soc-2011-tomato/release/scripts/modules/animsys_refactor.py
branches/soc-2011-tomato/release/scripts/modules/rna_prop_ui.py
branches/soc-2011-tomato/release/scripts/modules/sys_info.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/anim.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/intern/edgehash.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/armature/poselib.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_group.c
branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_object.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/gpu/GPU_buffers.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/modifiers/SConscript
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-tomato/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_FontObject.cpp
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/modules/rna_xml.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-43024
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-43129
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-01-04 15:28:03 UTC (rev
43130)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-01-04 15:42:07 UTC (rev
43131)
@@ -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)
@@ -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")
@@ -1393,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)
@@ -1405,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)
@@ -1541,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)
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
2012-01-04 15:28:03 UTC (rev 43130)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
2012-01-04 15:42:07 UTC (rev 43131)
@@ -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-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
2012-01-04 15:28:03 UTC (rev 43130)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
2012-01-04 15:42:07 UTC (rev 43131)
@@ -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'
Modified: branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
2012-01-04 15:28:03 UTC (rev 43130)
+++ branches/soc-2011-tomato/doc/python_api/rst/info_best_practice.rst
2012-01-04 15:42:07 UTC (rev 43131)
@@ -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
@@ -244,7 +244,7 @@
Checking String Start/End
^^^^^^^^^^^^^^^^^^^^^^^^^
-If your checking the start of a string for a keyword, rather than...
+If you're checking the start of a string for a keyword, rather than...
>>> if line[0:5] == "vert ": ...
@@ -279,8 +279,8 @@
In cases where you know you are checking for the same value which is
referenced from multiple places, ``is`` is faster.
-Time You're Code
-----------------
+Time Your Code
+--------------
While developing a script its good to time it to be aware of any changes in
performance, this can be done simply.
Modified: branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
2012-01-04 15:28:03 UTC (rev 43130)
+++ branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
2012-01-04 15:42:07 UTC (rev 43131)
@@ -262,8 +262,7 @@
#. Click on the button **Run Script**.
-#. Move you're mouse into the 3D view, press spacebar for the operator search
- menu, and type "Simple".
+#. Move your mouse into the 3D view, press spacebar for the operator search
menu, and type "Simple".
#. Click on the "Simple Operator" item found in search.
Modified: branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
2012-01-04 15:28:03 UTC (rev 43130)
+++ branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
2012-01-04 15:42:07 UTC (rev 43131)
@@ -16,7 +16,7 @@
There are 3 main uses for the terminal, these are:
-* You can see the output of ``print()`` as you're script runs, which is useful
to view debug info.
+* You can see the output of ``print()`` as your script runs, which is useful
to view debug info.
* The error trace-back is printed in full to the terminal which won't always
generate an error popup in blender's user interface (depending on how the
script is executed).
@@ -135,15 +135,15 @@
* if the results can be displayed as text - print them or write them to a file.
-This can take a little time to setup, but it can be well worth the effort to
reduce the time it takes to test changes - you can even have blender running
the script ever few seconds with a viewer updating the results, so no need to
leave you're text editor to see changes.
+This can take a little time to setup, but it can be well worth the effort to
reduce the time it takes to test changes - you can even have blender running
the script ever few seconds with a viewer updating the results, so no need to
leave your text editor to see changes.
Use External Tools
==================
-When there are no readily available python modules to perform specific tasks
it's worth keeping in mind you may be able to have python execute an external
command on you're data and read the result back in.
+When there are no readily available python modules to perform specific tasks
it's worth keeping in mind you may be able to have python execute an external
command on your data and read the result back in.
-Using external programs adds an extra dependency and may limit who can use the
script but to quickly setup you're own custom pipeline or writing one-off
scripts this can be handy.
+Using external programs adds an extra dependency and may limit who can use the
script but to quickly setup your own custom pipeline or writing one-off scripts
this can be handy.
Examples include:
@@ -157,7 +157,7 @@
Bundled Python & Extensions
===========================
-The Blender releases distributed from blender.org include a complete python
installation on all platforms, this has the disadvantage that any extensions
you have installed in you're systems python wont be found by blender.
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
