[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48649] branches/soc-2012-bratwurst: merge with trunk 48648
Antony Riakiotakis
kalast at gmail.com
Thu Jul 5 16:30:36 CEST 2012
Revision: 48649
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48649
Author: psy-fi
Date: 2012-07-05 14:30:35 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
merge with trunk 48648
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/GNUmakefile
branches/soc-2012-bratwurst/SConstruct
branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
branches/soc-2012-bratwurst/doc/build_systems/scons-dev.txt
branches/soc-2012-bratwurst/doc/build_systems/scons.txt
branches/soc-2012-bratwurst/doc/guides/interface_API.txt
branches/soc-2012-bratwurst/doc/python_api/rst/bge.render.rst
branches/soc-2012-bratwurst/doc/python_api/rst/bge.types.rst
branches/soc-2012-bratwurst/extern/carve/include/carve/csg.hpp
branches/soc-2012-bratwurst/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2012-bratwurst/extern/carve/include/carve/rtree.hpp
branches/soc-2012-bratwurst/extern/carve/lib/csg_data.hpp
branches/soc-2012-bratwurst/extern/carve/lib/csg_detail.hpp
branches/soc-2012-bratwurst/extern/carve/lib/intersect.cpp
branches/soc-2012-bratwurst/extern/carve/patches/strict_flags.patch
branches/soc-2012-bratwurst/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2012-bratwurst/intern/audaspace/intern/AUD_C-API.h
branches/soc-2012-bratwurst/intern/cycles/blender/addon/properties.py
branches/soc-2012-bratwurst/intern/cycles/render/image.cpp
branches/soc-2012-bratwurst/intern/cycles/render/image.h
branches/soc-2012-bratwurst/intern/cycles/render/nodes.cpp
branches/soc-2012-bratwurst/intern/ghost/GHOST_C-api.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2012-bratwurst/intern/raskter/raskter.c
branches/soc-2012-bratwurst/release/scripts/modules/bpy/utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/__init__.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/console_shell.py
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/blurry_footage.py
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/blurry_movie.py
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/default.py
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/fast_motion.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/clip.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_console.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-bratwurst/release/scripts/templates/addon_add_object.py
branches/soc-2012-bratwurst/release/scripts/templates/gamelogic.py
branches/soc-2012-bratwurst/release/scripts/templates/operator_node.py
branches/soc-2012-bratwurst/release/scripts/templates/ui_panel_simple.py
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_anim.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_image.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_modifier.h
branches/soc-2012-bratwurst/source/blender/blenkernel/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/blenkernel/SConscript
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/armature.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/material.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/modifier.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/nla.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/unit.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_args.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_math_geom.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/BLI_args.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/pbvh.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.h
branches/soc-2012-bratwurst/source/blender/collada/ImageExporter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Node.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeBase.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorToBWNode.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MapValueNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframing.c
branches/soc-2012-bratwurst/source/blender/editors/armature/armature_intern.h
branches/soc-2012-bratwurst/source/blender/editors/armature/armature_ops.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poseSlide.c
branches/soc-2012-bratwurst/source/blender/editors/armature/poselib.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editcurve.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_screen_types.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_draw.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_edit.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_shapekey.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/metaball/mball_edit.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_relations.c
branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_opengl.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_edit.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_ops.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/space_file.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/space_graph.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_info/info_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_nla/nla_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/space_node.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2012-bratwurst/source/blender/editors/space_time/space_time.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_snap.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-bratwurst/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2012-bratwurst/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/cineon/dpxfile.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/jp2.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/readimage.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/tiff.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_armature_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_curve_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_image_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_force.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_boid.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_curve.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_key.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_material.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_texture.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_ui.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_wm.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_world.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_socket.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna.c
branches/soc-2012-bratwurst/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_result.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-bratwurst/source/creator/CMakeLists.txt
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_Tree.h
branches/soc-2012-bratwurst/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/__init__.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/check_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/clean_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/merge_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_branches.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_mo.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_msg.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/user_settings.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
Removed Paths:
-------------
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/__init__.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/check_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/clean_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/merge_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_branches.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_mo.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_msg.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_po.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/user_settings.py
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2012-bratwurst/release/scripts/modules/i18n/
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/release/scripts/templates/operator_modal_view3d_raycast.py
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
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:46808-48523
+ /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:46808-48648
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2012-07-05 14:30:35 UTC (rev 48649)
@@ -148,7 +148,7 @@
# (unix defaults to OpenMP On)
-if(UNIX AND NOT APPLE)
+if((UNIX AND NOT APPLE) OR (MINGW))
set(PLATFORM_DEFAULT ON)
else()
set(PLATFORM_DEFAULT OFF)
@@ -997,9 +997,11 @@
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC10)
- set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
+ set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
+ set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
endif()
@@ -1008,11 +1010,6 @@
optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
- if(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
- else()
- set(BOOST_LIBPATH ${BOOST}/lib)
- endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
Modified: branches/soc-2012-bratwurst/GNUmakefile
===================================================================
--- branches/soc-2012-bratwurst/GNUmakefile 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/GNUmakefile 2012-07-05 14:30:35 UTC (rev 48649)
@@ -162,21 +162,21 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Testing Targets (not assosiated with building blender)"
+ @echo "Testing Targets (not associated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
@echo " * test_style - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
@echo ""
- @echo "Static Source Code Checking (not assosiated with building blender)"
+ @echo "Static Source Code Checking (not associated with building blender)"
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo " * check_spelling_c - check for spelling errors (C/C++ only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
- @echo "Documentation Targets (not assosiated with building blender)"
+ @echo "Documentation Targets (not associated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
@echo " * doc_doxy - generate doxygen C/C++ docs"
@echo " * doc_dna - generate blender file format reference"
Modified: branches/soc-2012-bratwurst/SConstruct
===================================================================
--- branches/soc-2012-bratwurst/SConstruct 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/SConstruct 2012-07-05 14:30:35 UTC (rev 48649)
@@ -769,8 +769,13 @@
if env['WITH_BF_SDL']:
dllsources.append('${LCGDIR}/sdl/lib/SDL.dll')
+ if(env['WITH_BF_OPENMP']):
+ dllsources.append('${LCGDIR}/binaries/libgomp-1.dll')
+
dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
- dllsources.append('${LCGDIR}/binaries/pthreadGC2-w64.dll')
+ dllsources.append('${LCGDIR}/binaries/libgcc_s_sjlj-1.dll')
+ dllsources.append('${LCGDIR}/binaries/libwinpthread-1.dll')
+ dllsources.append('${LCGDIR}/binaries/libstdc++-6.dll)')
dllsources.append('#source/icons/blender.exe.manifest')
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py 2012-07-05 14:30:35 UTC (rev 48649)
@@ -169,8 +169,8 @@
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
-#Produces errors while rendering with subsurf/multires,
-WITH_BF_OPENMP = False
+#May produce errors with unsupported MinGW-w64 builds
+WITH_BF_OPENMP = True
##
CC = 'gcc'
Modified: branches/soc-2012-bratwurst/doc/build_systems/scons-dev.txt
===================================================================
--- branches/soc-2012-bratwurst/doc/build_systems/scons-dev.txt 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/doc/build_systems/scons-dev.txt 2012-07-05 14:30:35 UTC (rev 48649)
@@ -37,7 +37,7 @@
Much of the actual functionality can be found in the python scripts
in the directory $BLENDERHOME/tools, with Blender.py defining the
bulk of the functionality. btools.py has some helper functions, and
- bcolors.py is for the terminal colours. mstoolkit.py and crossmingw.py
+ bcolors.py is for the terminal colors. mstoolkit.py and crossmingw.py
are modules which set up SCons for the MS VC++ 2003 toolkit and
the cross-compile toolset for compiling Windows binaries on Linux
respectively. Note: the cross-compile doesn't work yet for Blender,
Modified: branches/soc-2012-bratwurst/doc/build_systems/scons.txt
===================================================================
--- branches/soc-2012-bratwurst/doc/build_systems/scons.txt 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/doc/build_systems/scons.txt 2012-07-05 14:30:35 UTC (rev 48649)
@@ -48,7 +48,7 @@
% python ./scons/scons.py
This will start the build process with default values. Depending
- on your platform you may see colour in your output (non-Windows
+ on your platform you may see color in your output (non-Windows
machines). In the the beginning an overview of targets and arguments
from the command-line is given, then all libraries and binaries to
build are configured.
@@ -123,11 +123,11 @@
This rewrite features a cleaner output during the build process. If
you need to see the full command-line for compiles, then you can
- change that behaviour. Also the use of colours can be changed:
+ change that behaviour. Also the use of colors can be changed:
% python scons\scons.py BF_FANCY=0
- This will disable the use of colours.
+ This will disable the use of colors.
% python scons\scons.py BF_QUIET=0
Modified: branches/soc-2012-bratwurst/doc/guides/interface_API.txt
===================================================================
--- branches/soc-2012-bratwurst/doc/guides/interface_API.txt 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/doc/guides/interface_API.txt 2012-07-05 14:30:35 UTC (rev 48649)
@@ -173,7 +173,7 @@
UI_EMBOSSN 2 /* Button with no border */
UI_EMBOSSF 3 /* Square embossed button (file select) */
UI_EMBOSSM 4 /* Colored, for pulldown menus */
- UI_EMBOSSP 5 /* Simple borderless coloured button (like blender sensors) */
+ UI_EMBOSSP 5 /* Simple borderless colored button (like blender sensors) */
font:
UI_HELV 0 /* normal font */
Modified: branches/soc-2012-bratwurst/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/rst/bge.render.rst 2012-07-05 13:30:31 UTC (rev 48648)
+++ branches/soc-2012-bratwurst/doc/python_api/rst/bge.render.rst 2012-07-05 14:30:35 UTC (rev 48649)
@@ -94,11 +94,11 @@
If filename starts with // the image will be saved relative to the current directory.
If the filename contains # it will be replaced with the frame number.
- The standalone player saves .png files. It does not support colour space conversion
+ The standalone player saves .png files. It does not support color space conversion
or gamma correction.
When run from Blender, makeScreenshot supports Iris, IrisZ, TGA, Raw TGA, PNG, HamX, and Jpeg.
- Gamma, Colourspace conversion and Jpeg compression are taken from the Render settings panels.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list