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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Jan 29 13:00:16 CET 2012


Revision: 43750
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43750
Author:   kjym3
Date:     2012-01-29 12:00:04 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 43748.

Conflicts resolved:
source/blender/editors/include/UI_resources.h

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/doc/python_api/examples/bge.constraints.py
    branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.1.py
    branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.py
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.constraints.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.texture.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config_linux.h
    branches/soc-2008-mxcurioni/intern/boolop/SConscript
    branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
    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_shader.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_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/kernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cl
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cu
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_film.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_random.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/buffers.h
    branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/film.h
    branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
    branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/object.h
    branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
    branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_progress.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_types.h
    branches/soc-2008-mxcurioni/intern/ffmpeg/ffmpeg_compat.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.h
    branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
    branches/soc-2008-mxcurioni/release/scripts/presets/tracking_settings/blurry_footage.py
    branches/soc-2008-mxcurioni/release/scripts/presets/tracking_settings/default.py
    branches/soc-2008-mxcurioni/release/scripts/presets/tracking_settings/fast_motion.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.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_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.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_view3d_toolbar.py
    branches/soc-2008-mxcurioni/source/blender/avi/intern/endian.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.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/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_array.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.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/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    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_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_cloth_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_smoke_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.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_tracking.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_gamma.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelshading.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonKeyboard.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonMouse.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_passes.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_brightness.osl
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_brightness.h
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_brightness.c

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.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,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,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-43585
   + /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-43748

Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/bge.constraints.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bge.constraints.py	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bge.constraints.py	2012-01-29 12:00:04 UTC (rev 43750)
@@ -1,6 +1,6 @@
 """
 Basic Physics Constraint
-++++++++++++++++++++++
+++++++++++++++++++++++++
 Example of how to create a hinge Physics Constraint between two objects.
 """
 from bge import logic

Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.1.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.1.py	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.1.py	2012-01-29 12:00:04 UTC (rev 43750)
@@ -1,6 +1,6 @@
 """
-Texture replacement
-++++++++++++++++++++++
+Texture Replacement
++++++++++++++++++++
 Example of how to replace a texture in game with an external image.
 createTexture() and removeTexture() are to be called from a module Python
 Controller.

Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.py	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bge.texture.py	2012-01-29 12:00:04 UTC (rev 43750)
@@ -1,6 +1,6 @@
 """
 Basic Video Playback
-++++++++++++++++++++++
+++++++++++++++++++++
 Example of how to replace a texture in game with a video. It needs to run everyframe
 """
 import bge

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.constraints.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.constraints.rst	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.constraints.rst	2012-01-29 12:00:04 UTC (rev 43750)
@@ -5,7 +5,12 @@
 .. module:: bge.constraints
 
 .. literalinclude:: ../examples/bge.constraints.py
+   :language: rest
+   :lines: 2-4
 
+.. literalinclude:: ../examples/bge.constraints.py
+   :lines: 6-
+
 .. function:: createConstraint(physicsid, physicsid2, constrainttype, [pivotX, pivotY, pivotZ, [axisX, axisY, axisZ, [flag]]]])
 
    Creates a constraint.

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst	2012-01-29 12:00:04 UTC (rev 43750)
@@ -77,6 +77,14 @@
    
    :rtype: integer
 
+.. function:: setWindowSize(width, height)
+
+   Set the width and height of the window (in pixels). This also works for fullscreen applications.
+   
+   :type width: integer
+   :type height: integer
+
+
 .. function:: makeScreenshot(filename)
 
    Writes a screenshot to the given filename.

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.texture.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.texture.rst	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.texture.rst	2012-01-29 12:00:04 UTC (rev 43750)
@@ -37,9 +37,19 @@
 .. module:: bge.texture
 
 .. literalinclude:: ../examples/bge.texture.py
+   :language: rest
+   :lines: 2-4
 
+.. literalinclude:: ../examples/bge.texture.py
+   :lines: 6-
+
 .. literalinclude:: ../examples/bge.texture.1.py
+   :language: rest
+   :lines: 2-6
 
+.. literalinclude:: ../examples/bge.texture.1.py
+   :lines: 8-
+
 .. class:: VideoFFmpeg(file [, capture=-1, rate=25.0, width=0, height=0])
 
    FFmpeg video source

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2012-01-29 12:00:04 UTC (rev 43750)
@@ -66,6 +66,12 @@
 
       :type: dictionary {:ref:`keycode<keyboard-keys>`::ref:`status<input-status>`, ...}
 
+   .. attribute:: active_events
+
+      A dictionary containing the status of only the active keyboard events or keys. (read-only).
+
+      :type: dictionary {:ref:`keycode<keyboard-keys>`::ref:`status<input-status>`, ...}
+
 .. class:: SCA_PythonMouse(PyObjectPlus)
 
    The current mouse.
@@ -75,6 +81,12 @@
       a dictionary containing the status of each mouse event. (read-only).
 
       :type: dictionary {:ref:`keycode<mouse-keys>`::ref:`status<input-status>`, ...}
+
+   .. attribute:: active_events
+
+      a dictionary containing the status of only the active mouse events. (read-only).
+
+      :type: dictionary {:ref:`keycode<mouse-keys>`::ref:`status<input-status>`, ...}
       
    .. attribute:: position
 
@@ -942,7 +954,7 @@
 
       .. deprecated:: use :data:`localPosition` and :data:`worldPosition`.
 
-      :type: :class:`mathurils.Vector`
+      :type: :class:`mathutils.Vector`
 
    .. attribute:: orientation
 
@@ -980,7 +992,7 @@
 
    .. attribute:: worldScale
 
-      The object's world scaling factor. Read-only. [sx, sy, sz]
+      The object's world scaling factor. [sx, sy, sz]
 
       :type: :class:`mathutils.Vector`
 
@@ -995,6 +1007,18 @@
       The object's world position. [x, y, z]
 
       :type: :class:`mathutils.Vector`
+
+   .. attribute:: localTransform
+
+      The object's local space transform matrix. 4x4 Matrix.
+
+      :type: :class:`mathutils.Matrix`
+
+   .. attribute:: worldTransform
+
+      The object's world space transform matrix. 4x4 Matrix.
+
+      :type: :class:`mathutils.Matrix`
 	  
    .. attribute:: localLinearVelocity
       

Modified: branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config.h	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config.h	2012-01-29 12:00:04 UTC (rev 43750)
@@ -2,14 +2,14 @@
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Namespace for Google classes */
-#ifdef __APPLE__
+#if defined(__APPLE__)
  #include "config_mac.h"
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #include "config_freebsd.h"
-#elif __MINGW32__
+#elif defined(__MINGW32__)
  #include "windows/config.h"
-#elif __GNUC__
+#elif defined(__linux__)
  #include "config_linux.h"
-#elif _MSC_VER
+#elif defined(_MSC_VER)
  #include "windows/config.h"
 #endif

Modified: branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config_linux.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config_linux.h	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config_linux.h	2012-01-29 12:00:04 UTC (rev 43750)
@@ -133,8 +133,10 @@
 /* How to access the PC from a struct ucontext */
 #if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
   #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
+#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)
+  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
 #else
-  #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
+  #undef PC_FROM_UCONTEXT
 #endif
 
 /* Define to necessary symbol if this constant uses a non-standard name on

Modified: branches/soc-2008-mxcurioni/intern/boolop/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/SConscript	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/intern/boolop/SConscript	2012-01-29 12:00:04 UTC (rev 43750)
@@ -8,6 +8,7 @@
 defs = []
 
 if not env['WITH_BF_CARVE']:
+    import os
     sources = env.Glob('intern/*.cpp')
     sources.remove('intern' + os.sep + 'BOP_CarveInterface.cpp')
 else:

Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_CarveInterface.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_CarveInterface.cpp	2012-01-29 11:11:20 UTC (rev 43749)
+++ branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_CarveInterface.cpp	2012-01-29 12:00:04 UTC (rev 43750)
@@ -15,12 +15,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * The Original Code is Copyright (C) 2010 by the Blender Foundation.
  * All rights reserved.
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Ken Hughes,
+ *                 Sergey Sharybin.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -36,6 +37,9 @@
 #include <carve/interpolator.hpp>
 #include <carve/rescale.hpp>
 
+#include <iostream>
+
+using namespace carve::mesh;
 typedef unsigned int uint;
 
 #define MAX(x,y) ((x)>(y)?(x):(y))
@@ -61,11 +65,169 @@
 	return 1;
 }
 
-static carve::mesh::MeshSet<3> *Carve_addMesh(CSG_FaceIteratorDescriptor& face_it,

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list