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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Jul 14 01:23:07 CEST 2012


Revision: 48900
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48900
Author:   kjym3
Date:     2012-07-13 23:23:06 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 48893.

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiter.h
    branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiterC-Api.h
    branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2008-mxcurioni/intern/raskter/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/raskter/raskter.c
    branches/soc-2008-mxcurioni/intern/raskter/raskter.h
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/check_po.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/clean_po.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/merge_po.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_branches.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_mo.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_msg.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_po.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_pot.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/update_trunk.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.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_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/text/readme.html
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lamp.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mask.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bmfont.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.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/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lamp.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.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/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/property.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.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/shrinkwrap.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.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/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voronoi.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voxel.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ImageExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/compositor/COM_compositor.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_CPUDevice.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Converter.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_OpenCLDevice.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_SocketReader.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_KeyingNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_KeyingNode.h
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_AntiAliasOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BilateralBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BoxMaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BrightnessOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BrightnessOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CalculateMeanOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChangeHSVOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ChromaMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorRampOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorRampOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorSpillOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CombineChannelsOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CropOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CropOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DisplaceOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DotproductOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DotproductOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_EllipseMaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FlipOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_FlipOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GammaCorrectOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GammaOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GammaOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareThresholdOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_IDMaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_IDMaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ImageOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_InvertOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_InvertOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingClipOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingDespillOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapUVOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapValueOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapValueOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MaskOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MathBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixAddOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixAddOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBlendOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBlendOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBurnOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixBurnOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixColorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixColorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDarkenOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDifferenceOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDivideOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDivideOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixDodgeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixGlareOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixGlareOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixHueOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixLightenOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixLightenOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixLinearLightOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixMultiplyOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixOverlayOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSaturationOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixScreenOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixScreenOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSoftLightOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixSubtractOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixValueOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MixValueOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MultilayerImageOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_NormalizeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_NormalizeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OutputFileOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OutputFileOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RotateOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_RotateOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScaleOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScaleOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SeparateChannelOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetAlphaOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetColorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetSamplerOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetValueOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetVectorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SocketProxyOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_SplitViewerOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TextureOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TonemapOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TonemapOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TranslateOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TranslateOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VectorBlurOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VectorCurveOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ViewerOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_WriteBufferOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ZCombineOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ZCombineOperation.h
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_deps.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.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/animation/fmodifier_ui.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseUtils.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/armature/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.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/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/io/io_collada.c
    branches/soc-2008-mxcurioni/source/blender/editors/io/io_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_editaction.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.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_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
    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_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.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/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.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/drawvolume.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_moviecache.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/moviecache.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_multi.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_stub.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    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/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    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/modifiers/intern/MOD_boolean_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
    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/occlusion.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_result.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/shadbuf.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture_ocean.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h

Added Paths:
-----------
    branches/soc-2008-mxcurioni/intern/raskter/raskter_kdtree.c
    branches/soc-2008-mxcurioni/intern/raskter/raskter_kdtree.h
    branches/soc-2008-mxcurioni/intern/raskter/raskter_mt.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TrackPositionNode.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_trackpos.c

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
    branches/soc-2008-mxcurioni/source/tools/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-48695
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-48893

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2012-07-13 21:54:51 UTC (rev 48899)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2012-07-13 23:23:06 UTC (rev 48900)
@@ -1335,18 +1335,10 @@
 
       Rigid body physics allows the object to roll on collisions.
 
-      .. note::
-         
-         This is not working with bullet physics yet.
-
    .. method:: disableRigidBody()
 
       Disables rigid body physics for this object.
 
-      .. note::
-
-         This is not working with bullet physics yet. The angular is removed but rigid body physics can still rotate it later.
-
    .. method:: setParent(parent, compound=True, ghost=True)
 
       Sets this object's parent.
@@ -4222,6 +4214,10 @@
    .. attribute:: projection_matrix
 
       This camera's 4x4 projection matrix.
+	  
+      .. note::
+      
+         This is the identity matrix prior to rendering the first frame (any Python done on frame 1). 
 
       :type: 4x4 Matrix [[float]]
 
@@ -4233,7 +4229,7 @@
 
       .. note::
       
-         This matrix is regenerated every frame from the camera's position and orientation. 
+         This matrix is regenerated every frame from the camera's position and orientation. Also, this is the identity matrix prior to rendering the first frame (any Python done on frame 1).
 
    .. attribute:: camera_to_world
 

Modified: branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp	2012-07-13 21:54:51 UTC (rev 48899)
+++ branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp	2012-07-13 23:23:06 UTC (rev 48900)
@@ -378,10 +378,19 @@
 		int mesh_tri_offset = mesh->tri_offset;
 
 		/* fill in node indexes for instances */
-		if(bvh->pack.is_leaf[0])
+		if(
+		   /* XXX, brecht. check this is needed!. it could be a bug elsewhere
+		    * /mango/pro/scenes/04_2e/04_2e.blend r2158. on Ian's system 192.168.3.27  - campbell */
+		   (bvh->pack.is_leaf.size() != 0) &&
+
+		   /* previously only checked this */
+		   bvh->pack.is_leaf[0])
+		{
 			pack.object_node[object_offset++] = -noffset-1;
-		else
+		}
+		else {
 			pack.object_node[object_offset++] = noffset;
+		}
 
 		mesh_map[mesh] = pack.object_node[object_offset-1];
 

Modified: branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.cpp	2012-07-13 21:54:51 UTC (rev 48899)
+++ branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.cpp	2012-07-13 23:23:06 UTC (rev 48900)
@@ -26,8 +26,6 @@
 #include "util_path.h"
 #include "util_types.h"
 
-#define BOOST_FILESYSTEM_VERSION 2
-
 #include <boost/filesystem.hpp> 
 #include <boost/algorithm/string.hpp>
 
@@ -117,7 +115,7 @@
 		boost::filesystem::directory_iterator it(dir), it_end;
 
 		for(; it != it_end; it++) {
-			string filename = it->path().filename();
+			string filename = it->path().filename().string();
 
 			if(boost::starts_with(filename, name))
 				if(except.find(filename) == except.end())

Modified: branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp	2012-07-13 21:54:51 UTC (rev 48899)
+++ branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp	2012-07-13 23:23:06 UTC (rev 48900)
@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#define BOOST_FILESYSTEM_VERSION 2
-
 #include <boost/filesystem.hpp> 
 #include <boost/algorithm/string.hpp>
 
@@ -60,7 +58,7 @@
 
 string path_filename(const string& path)
 {
-	return boost::filesystem::path(path).filename();
+	return boost::filesystem::path(path).filename().string();
 }
 
 string path_dirname(const string& path)

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp	2012-07-13 21:54:51 UTC (rev 48899)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp	2012-07-13 23:23:06 UTC (rev 48900)
@@ -93,9 +93,12 @@
 		abort(); //was return before, but this would just mean it will crash later
 	}
 
-	/* Open a connection to the X input manager */
 #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
-	m_xim = XOpenIM(m_display, NULL, (char *)GHOST_X11_RES_NAME, (char *)GHOST_X11_RES_CLASS);
+	/* note -- don't open connection to XIM server here, because the locale
+	 * has to be set before opening the connection but setlocale() has not
+	 * been called yet.  the connection will be opened after entering
+	 * the event loop. */
+	m_xim = NULL;
 #endif
 
 	m_delete_window_atom 
@@ -273,6 +276,35 @@
 	return window;
 }
 
+#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+static void destroyIMCallback(XIM xim, XPointer ptr, XPointer data)
+{
+	GHOST_PRINT("XIM server died\n");
+
+	if (ptr)
+		*(XIM *)ptr = NULL;
+}
+
+bool GHOST_SystemX11::openX11_IM()
+{
+	if (!m_display)
+		return false;
+
+	/* set locale modifiers such as "@im=ibus" specified by XMODIFIERS */
+	XSetLocaleModifiers("");
+
+	m_xim = XOpenIM(m_display, NULL, (char *)GHOST_X11_RES_NAME, (char *)GHOST_X11_RES_CLASS);
+	if (!m_xim)
+		return false;
+
+	XIMCallback destroy;
+	destroy.callback = (XIMProc)destroyIMCallback;
+	destroy.client_data = (XPointer)&m_xim;
+	XSetIMValues(m_xim, XNDestroyCallback, &destroy, NULL);
+	return true;
+}
+#endif
+
 GHOST_WindowX11 *
 GHOST_SystemX11::
 findGhostWindow(
@@ -408,6 +440,38 @@
 		while (XPending(m_display)) {
 			XEvent xevent;
 			XNextEvent(m_display, &xevent);
+
+#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+			/* open connection to XIM server and create input context (XIC)
+			 * when receiving the first FocusIn or KeyPress event after startup,
+			 * or recover XIM and XIC when the XIM server has been restarted */
+			if (xevent.type == FocusIn || xevent.type == KeyPress) {
+				if (!m_xim && openX11_IM()) {
+					GHOST_PRINT("Connected to XIM server\n");
+				}
+
+				if (m_xim) {
+					GHOST_WindowX11 * window = findGhostWindow(xevent.xany.window);
+					if (window && !window->getX11_XIC() && window->createX11_XIC()) {
+						GHOST_PRINT("XIM input context created\n");
+						if (xevent.type == KeyPress)
+							/* we can assume the window has input focus
+							 * here, because key events are received only
+							 * when the window is focused. */
+							XSetICFocus(window->getX11_XIC());
+					}
+				}
+			}
+
+			/* dispatch event to XIM server */
+			if ((XFilterEvent(&xevent, (Window)NULL) == True) && (xevent.type != KeyRelease)) {
+				/* do nothing now, the event is consumed by XIM.
+				 * however, KeyRelease event should be processed
+				 * here, otherwise modifiers remain activated.   */
+				continue;
+			}
+#endif
+
 			processEvent(&xevent);
 			anyProcessed = true;
 		}
@@ -535,7 +599,19 @@
 			XKeyEvent *xke = &(xe->xkey);
 			KeySym key_sym = XLookupKeysym(xke, 0);
 			char ascii;
-			char utf8_buf[6]; /* 6 is enough for a utf8 char */
+#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+			/* utf8_array[] is initial buffer used for Xutf8LookupString().
+			 * if the length of the utf8 string exceeds this array, allocate
+			 * another memory area and call Xutf8LookupString() again.
+			 * the last 5 bytes are used to avoid segfault that might happen
+			 * at the end of this buffer when the constructor of GHOST_EventKey
+			 * reads 6 bytes regardless of the effective data length. */
+			char utf8_array[16 * 6 + 5]; /* 16 utf8 characters */
+			char *utf8_buf = utf8_array;
+			int len = 1; /* at least one null character will be stored */
+#else
+			char *utf8_buf = NULL;
+#endif
 			
 			GHOST_TKey gkey = convertXKey(key_sym);
 			GHOST_TEventType type = (xke->type == KeyPress) ? 
@@ -547,15 +623,20 @@
 			
 #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
 			/* getting unicode on key-up events gives XLookupNone status */
-			if (xke->type == KeyPress) {
+			XIC xic = window->getX11_XIC();
+			if (xic && xke->type == KeyPress) {
 				Status status;
-				int len;
 
 				/* use utf8 because its not locale depentant, from xorg docs */
-				if (!(len = Xutf8LookupString(window->getX11_XIC(), xke, utf8_buf, sizeof(utf8_buf), &key_sym, &status))) {
+				if (!(len = Xutf8LookupString(xic, xke, utf8_buf, sizeof(utf8_array) - 5, &key_sym, &status))) {
 					utf8_buf[0] = '\0';
 				}
 
+				if (status == XBufferOverflow) {
+					utf8_buf = (char *) malloc(len + 5);
+					len = Xutf8LookupString(xic, xke, utf8_buf, len, &key_sym, &status);
+				}
+
 				if ((status == XLookupChars || status == XLookupBoth)) {
 					if ((unsigned char)utf8_buf[0] >= 32) { /* not an ascii control character */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list