[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44043] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 44039.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Feb 12 01:09:59 CET 2012
Revision: 44043
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44043
Author: kjym3
Date: 2012-02-12 00:09:48 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 44039.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44039
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/doc/python_api/rst/gpu.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.sh
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/binreloc/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/soc-2008-mxcurioni/extern/carve/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/colamd/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/eltopo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/glew/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libopenjpeg/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libredcode/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzma/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/recastnavigation/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
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/blender/blender_sync.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_brightness.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noise.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_vector3dim.h
branches/soc-2008-mxcurioni/intern/elbeem/intern/utilities.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_import.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/image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.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_physics_dynamicpaint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_nla.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/release/scripts/startup/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/scripts/templates/ui_menu.py
branches/soc-2008-mxcurioni/release/text/readme.html
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.h
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ExportSettings.h
branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_genfile.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.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/python/mathutils/mathutils_noise.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2008-mxcurioni/source/tests/bl_pyapi_mathutils.py
branches/soc-2008-mxcurioni/source/tools/spell_check_source.py
branches/soc-2008-mxcurioni/source/tools/spell_check_source_config.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/scons/config/Modules/
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/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-43881
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/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,43872
/trunk/blender:34011-39896,39898-40096,40098-44039
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-02-11 21:39:09 UTC (rev 44042)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-02-12 00:09:48 UTC (rev 44043)
@@ -1490,10 +1490,9 @@
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(WITH_IK_ITASC OR WITH_MOD_FLUID)
+ if(WITH_IK_ITASC)
message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.")
set(WITH_IK_ITASC OFF)
- set(WITH_MOD_FLUID OFF)
endif()
endif()
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2012-02-11 21:39:09 UTC (rev 44042)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2012-02-12 00:09:48 UTC (rev 44043)
@@ -169,6 +169,7 @@
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
+ @echo " * check_spelling - check for spelling errors (Python only for now)"
@echo ""
@echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
@@ -242,7 +243,10 @@
$(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+check_spelling:
+ cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py `find $(BLENDER_DIR)/release/scripts -name "*.py" | sort`
+
# -----------------------------------------------------------------------------
# Documentation
#
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py 2012-02-11 21:39:09 UTC (rev 44042)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py 2012-02-12 00:09:48 UTC (rev 44043)
@@ -1,6 +1,8 @@
# find library directory
import platform
import os
+from Modules.FindPython import FindPython
+
bitness = platform.architecture()[0]
if bitness == '64bit':
LCGDIR = '../lib/linux64'
@@ -8,10 +10,12 @@
LCGDIR = '../lib/linux'
LIBDIR = "#${LCGDIR}"
-BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros
-BF_PYTHON = '/usr'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.2'
+py = FindPython()
+
+BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS']
+BF_PYTHON = py['PYTHON']
+BF_PYTHON_LIBPATH = py['LIBPATH']
+BF_PYTHON_VERSION = py['VERSION']
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2012-02-11 21:39:09 UTC (rev 44042)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2012-02-12 00:09:48 UTC (rev 44043)
@@ -437,8 +437,9 @@
static_ob, shared_ob = SCons.Tool.createObjBuilders(env)
static_ob.add_action('.c', mycaction)
static_ob.add_action('.cpp', mycppaction)
+ static_ob.add_action('.cc', mycppaction)
shared_ob.add_action('.c', myshcaction)
- shared_ob.add_action('.cpp', myshcppaction)
+ shared_ob.add_action('.cc', myshcppaction)
static_lib = SCons.Builder.Builder(action = mylibaction,
emitter = '$LIBEMITTER',
@@ -648,8 +649,11 @@
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+ lib = env['BF_PYTHON_LIBPATH'].split(os.sep)[-1]
+ target_lib = "lib64" if lib == "lib64" else "lib"
+
py_src = env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] )
- py_target = env.subst( dir + '/python/lib/python'+env['BF_PYTHON_VERSION'] )
+ py_target = env.subst( dir + '/python/' + target_lib + '/python'+env['BF_PYTHON_VERSION'] )
# This is a bit weak, but dont install if its been installed before, makes rebuilds quite slow.
if os.path.exists(py_target):
Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/gpu.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/gpu.rst 2012-02-11 21:39:09 UTC (rev 44042)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/gpu.rst 2012-02-12 00:09:48 UTC (rev 44043)
@@ -1,13 +1,14 @@
+*******************
GPU functions (gpu)
-===================
+*******************
.. module:: gpu
This module provides access to materials GLSL shaders.
-*****
+
Intro
-*****
+=====
Module to provide functions concerning the GPU implementation in Blender, in particular
the GLSL shaders that blender generates automatically to render materials in the 3D view
@@ -15,16 +16,15 @@
.. warning::
- The API provided by this module should be consider unstable. The data exposed by the API
- are are closely related to Blender's internal GLSL code and may change if the GLSL code
- is modified (e.g. new uniform type).
+ The API provided by this module should be consider unstable. The data exposed by the API
+ are are closely related to Blender's internal GLSL code and may change if the GLSL code
+ is modified (e.g. new uniform type).
-*********
Constants
-*********
+=========
---------------
+
GLSL data type
--------------
@@ -59,15 +59,15 @@
.. data:: GPU_DATA_3F
three floats
-
+
:value: 4
-
+
.. data:: GPU_DATA_4F
four floats
-
+
:value: 5
-
+
.. data:: GPU_DATA_9F
matrix 3x3 in column-major order
@@ -86,448 +86,450 @@
:value: 8
------------------
+
GLSL uniform type
-----------------
.. _uniform-type:
-Constants that specify the type of uniform used in a GLSL shader.
+Constants that specify the type of uniform used in a GLSL shader.
The uniform type determines the data type, origin and method
-of calculation used by Blender to compute the uniform value.
+of calculation used by Blender to compute the uniform value.
The calculation of some of the uniforms is based on matrices available in the scene:
- .. _mat4_cam_to_world:
- .. _mat4_world_to_cam:
+ .. _mat4_cam_to_world:
+ .. _mat4_world_to_cam:
- *mat4_cam_to_world*
- Model matrix of the camera. OpenGL 4x4 matrix that converts
- camera local coordinates to world coordinates. In blender this is obtained from the
- 'matrix_world' attribute of the camera object.
+ *mat4_cam_to_world*
+ Model matrix of the camera. OpenGL 4x4 matrix that converts
+ camera local coordinates to world coordinates. In blender this is obtained from the
+ 'matrix_world' attribute of the camera object.
- Some uniform will need the *mat4_world_to_cam*
- matrix computed as the inverse of this matrix.
+ Some uniform will need the *mat4_world_to_cam*
+ matrix computed as the inverse of this matrix.
- .. _mat4_object_to_world:
- .. _mat4_world_to_object:
+ .. _mat4_object_to_world:
+ .. _mat4_world_to_object:
- *mat4_object_to_world*
- Model matrix of the object that is being rendered. OpenGL 4x4 matric that converts
- object local coordinates to world coordinates. In blender this is obtained from the
- 'matrix_world' attribute of the object.
-
- Some uniform will need the *mat4_world_to_object* matrix, computed as the inverse of this matrix.
-
- .. _mat4_lamp_to_world:
- .. _mat4_world_to_lamp:
+ *mat4_object_to_world*
+ Model matrix of the object that is being rendered. OpenGL 4x4 matric that converts
+ object local coordinates to world coordinates. In blender this is obtained from the
+ 'matrix_world' attribute of the object.
- *mat4_lamp_to_world*
- Model matrix of the lamp lighting the object. OpenGL 4x4 matrix that converts lamp
- local coordinates to world coordinates. In blender this is obtained from the
- 'matrix_world' attribute of the lamp object.
-
- Some uniform will need the *mat4_world_to_lamp* matrix
- computed as the inverse of this matrix.
+ Some uniform will need the *mat4_world_to_object* matrix, computed as the inverse of this matrix.
+ .. _mat4_lamp_to_world:
+ .. _mat4_world_to_lamp:
+
+ *mat4_lamp_to_world*
+ Model matrix of the lamp lighting the object. OpenGL 4x4 matrix that converts lamp
+ local coordinates to world coordinates. In blender this is obtained from the
+ 'matrix_world' attribute of the lamp object.
+
+ Some uniform will need the *mat4_world_to_lamp* matrix
+ computed as the inverse of this matrix.
+
.. data:: GPU_DYNAMIC_OBJECT_VIEWMAT
- The uniform is a 4x4 GL matrix that converts world coordinates to
- camera coordinates (see mat4_world_to_cam_). Can be set once per frame.
- There is at most one uniform of that type per shader.
+ The uniform is a 4x4 GL matrix that converts world coordinates to
+ camera coordinates (see mat4_world_to_cam_). Can be set once per frame.
+ There is at most one uniform of that type per shader.
- :value: 1
+ :value: 1
.. data:: GPU_DYNAMIC_OBJECT_MAT
- The uniform is a 4x4 GL matrix that converts object coordinates
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list