[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48071] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47961:48070
Campbell Barton
ideasman42 at gmail.com
Tue Jun 19 10:16:24 CEST 2012
Revision: 48071
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48071
Author: campbellbarton
Date: 2012-06-19 08:16:07 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47961:48070
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47961
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Object.py
branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Panel.1.py
branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/plyfile.c
branches/soc-2011-tomato/intern/elbeem/intern/controlparticles.cpp
branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2011-tomato/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/second_life.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/paint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/intern/fnmatch.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.h
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/collada/collada.h
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.h
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CPUDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeBase.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Socket.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketConnection.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CropNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DisplaceNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FlipNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapUVNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapValueNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MixNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_NormalizeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RotateNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SwitchNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TransformNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TranslateNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CropOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_QualityStepHelper.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/soc-2011-tomato/source/blender/editors/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/SConscript
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_api/SConscript
branches/soc-2011-tomato/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-tomato/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_intern.h
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_panels.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.h
branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.h
branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pixelblending.c
branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBase.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterColor.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterNormal.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterSource.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBase.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBuff.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageMix.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageRender.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/PyTypeList.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/PyTypeList.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoBase.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/soc-2011-tomato/source/blender/editors/io/
branches/soc-2011-tomato/source/blender/editors/io/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/io/SConscript
branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
branches/soc-2011-tomato/source/blender/editors/io/io_collada.h
branches/soc-2011-tomato/source/blender/editors/io/io_ops.c
branches/soc-2011-tomato/source/blender/editors/io/io_ops.h
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/editors/io/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/io/SConscript
branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
branches/soc-2011-tomato/source/blender/editors/io/io_collada.h
branches/soc-2011-tomato/source/blender/editors/io/io_ops.c
branches/soc-2011-tomato/source/blender/editors/io/io_ops.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47961
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48070
Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Object.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Object.py 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Object.py 2012-06-19 08:16:07 UTC (rev 48071)
@@ -2,7 +2,7 @@
Basic Object Operations Example
+++++++++++++++++++++++++++++++
This script demonstrates basic operations on object like creating new
-object, placing it into scene, selecting it and making it active
+object, placing it into scene, selecting it and making it active.
"""
import bpy
@@ -11,15 +11,15 @@
scene = bpy.context.scene
# Create new lamp datablock
-lamp_data = bpy.data.lamps.new(name="New Lamp", type="POINT")
+lamp_data = bpy.data.lamps.new(name="New Lamp", type='POINT')
-# Create new object with out lamp datablock
+# Create new object with our lamp datablock
lamp_object = bpy.data.objects.new(name="New Lamp", object_data=lamp_data)
# Link lamp object to the scene so it'll appear in this scene
scene.objects.link(lamp_object)
-# Place lamp to specified location
+# Place lamp to a specified location
lamp_object.location = (5.0, 5.0, 5.0)
# And finally select it make active
Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Panel.1.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Panel.1.py 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Panel.1.py 2012-06-19 08:16:07 UTC (rev 48071)
@@ -2,7 +2,7 @@
Simple Object Panel
+++++++++++++++++++
This panel has a :class:`Panel.poll` and :class:`Panel.draw_header` function,
-even though the contents is basic this closely resemples blenders panels.
+even though the contents is basic this closely resembles blenders panels.
"""
import bpy
Modified: branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp
===================================================================
--- branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/extern/recastnavigation/recast-capi.cpp 2012-06-19 08:16:07 UTC (rev 48071)
@@ -278,7 +278,7 @@
#define min(a, b) (a) < (b) ? a : b
#define swapcode(TYPE, parmi, parmj, n) \
{ \
- long i = (n) / sizeof (TYPE); \
+ long i = (n) / sizeof(TYPE); \
TYPE *pi = (TYPE *) (parmi); \
TYPE *pj = (TYPE *) (parmj); \
do { \
Modified: branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp 2012-06-19 08:16:07 UTC (rev 48071)
@@ -28,7 +28,7 @@
#include "AUD_PyAPI.h"
-#include "structmember.h"
+#include <structmember.h>
#include "AUD_I3DDevice.h"
#include "AUD_I3DHandle.h"
Modified: branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-06-19 08:16:07 UTC (rev 48071)
@@ -143,23 +143,23 @@
switch(m_codecCtx->sample_fmt)
{
- case SAMPLE_FMT_U8:
+ case AV_SAMPLE_FMT_U8:
m_convert = AUD_convert_u8_float;
m_specs.format = AUD_FORMAT_U8;
break;
- case SAMPLE_FMT_S16:
+ case AV_SAMPLE_FMT_S16:
m_convert = AUD_convert_s16_float;
m_specs.format = AUD_FORMAT_S16;
break;
- case SAMPLE_FMT_S32:
+ case AV_SAMPLE_FMT_S32:
m_convert = AUD_convert_s32_float;
m_specs.format = AUD_FORMAT_S32;
break;
- case SAMPLE_FMT_FLT:
+ case AV_SAMPLE_FMT_FLT:
m_convert = AUD_convert_copy<float>;
m_specs.format = AUD_FORMAT_FLOAT32;
break;
- case SAMPLE_FMT_DBL:
+ case AV_SAMPLE_FMT_DBL:
m_convert = AUD_convert_double_float;
m_specs.format = AUD_FORMAT_FLOAT64;
break;
@@ -189,7 +189,7 @@
}
catch(AUD_Exception&)
{
- av_close_input_file(m_formatCtx);
+ avformat_close_input(&m_formatCtx);
throw;
}
}
@@ -227,7 +227,7 @@
}
catch(AUD_Exception&)
{
- av_close_input_stream(m_formatCtx);
+ avformat_close_input(&m_formatCtx);
av_free(m_aviocontext);
throw;
}
@@ -239,7 +239,7 @@
if(m_aviocontext)
{
- av_close_input_stream(m_formatCtx);
+ avformat_close_input(&m_formatCtx);
av_free(m_aviocontext);
}
else
Modified: branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-06-19 08:16:07 UTC (rev 48071)
@@ -133,23 +133,23 @@
{
case AUD_FORMAT_U8:
m_convert = AUD_convert_float_u8;
- m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
break;
case AUD_FORMAT_S16:
m_convert = AUD_convert_float_s16;
- m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
break;
case AUD_FORMAT_S32:
m_convert = AUD_convert_float_s32;
- m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
break;
case AUD_FORMAT_FLOAT32:
m_convert = AUD_convert_copy<float>;
- m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
break;
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_float_double;
- m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
break;
default:
AUD_THROW(AUD_ERROR_FFMPEG, format_error);
Modified: branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/plyfile.c
===================================================================
--- branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/plyfile.c 2012-06-19 07:46:45 UTC (rev 48070)
+++ branches/soc-2011-tomato/intern/bsp/test/BSP_GhostTest/plyfile.c 2012-06-19 08:16:07 UTC (rev 48071)
@@ -28,37 +28,37 @@
/*
-The interface routines for reading and writing PLY polygon files.
+ The interface routines for reading and writing PLY polygon files.
-Greg Turk, February 1994
+ Greg Turk, February 1994
----------------------------------------------------------------
+ ---------------------------------------------------------------
-A PLY file contains a single polygonal _object_.
+ A PLY file contains a single polygonal _object_.
-An object is composed of lists of _elements_. Typical elements are
-vertices, faces, edges and materials.
+ An object is composed of lists of _elements_. Typical elements are
+ vertices, faces, edges and materials.
-Each type of element for a given object has one or more _properties_
-associated with the element type. For instance, a vertex element may
-have as properties the floating-point values x,y,z and the three unsigned
-chars representing red, green and blue.
+ Each type of element for a given object has one or more _properties_
+ associated with the element type. For instance, a vertex element may
+ have as properties the floating-point values x,y,z and the three unsigned
+ chars representing red, green and blue.
----------------------------------------------------------------
+ ---------------------------------------------------------------
-Copyright (c) 1994 The Board of Trustees of The Leland Stanford
-Junior University. All rights reserved.
+ Copyright (c) 1994 The Board of Trustees of The Leland Stanford
+ Junior University. All rights reserved.
-Permission to use, copy, modify and distribute this software and its
-documentation for any purpose is hereby granted without fee, provided
-that the above copyright notice and this permission notice appear in
-all copies of this software and that you do not sell the software.
+ Permission to use, copy, modify and distribute this software and its
+ documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice and this permission notice appear in
+ all copies of this software and that you do not sell the software.
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-*/
+ */
#include <stdio.h>
#include <stdlib.h>
@@ -67,14 +67,14 @@
#include "ply.h"
char *type_names[] = {
-"invalid",
-"char", "short", "int",
-"uchar", "ushort", "uint",
-"float", "double",
+ "invalid",
+ "char", "short", "int",
+ "uchar", "ushort", "uint",
+ "float", "double",
};
int ply_type_size[] = {
- 0, 1, 2, 4, 1, 2, 4, 4, 8
+ 0, 1, 2, 4, 1, 2, 4, 4, 8
};
#define NO_OTHER_PROPS -1
@@ -96,7 +96,7 @@
PlyProperty *find_property(PlyElement *, char *, int *);
/* write to a file the word describing a PLY file data type */
-void write_scalar_type (FILE *, int);
+void write_scalar_type(FILE *, int);
/* read a line from a file and break it up into separate words */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list