Revision: 47874
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47874
Author: campbellbarton
Date: 2012-06-14 09:39:54 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47805:47873
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47805
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_emission.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_light.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/render/integrator.cpp
branches/soc-2011-tomato/intern/cycles/render/integrator.h
branches/soc-2011-tomato/intern/cycles/render/light.cpp
branches/soc-2011-tomato/intern/cycles/render/light.h
branches/soc-2011-tomato/intern/cycles/render/object.cpp
branches/soc-2011-tomato/intern/cycles/render/scene.cpp
branches/soc-2011-tomato/intern/raskter/raskter.c
branches/soc-2011-tomato/intern/raskter/raskter.h
branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/blender_24x.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/elsyiun.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/hexagon.xml
branches/soc-2011-tomato/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ErrorHandler.cpp
branches/soc-2011-tomato/source/blender/collada/ExtraHandler.cpp
branches/soc-2011-tomato/source/blender/collada/ExtraTags.cpp
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/collada/InstanceWriter.cpp
branches/soc-2011-tomato/source/blender/collada/LightExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
branches/soc-2011-tomato/source/blender/collada/SkinInfo.cpp
branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/collada/collada_internal.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CPUDevice.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChannelInfo.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Device.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Node.h
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_NodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_OutputSocket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Socket.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketConnection.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkPackage.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_AlphaOverNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BoxMaskNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BrightnessNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChannelMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ChromaMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorBalanceNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorRampNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorSpillNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorToBWNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineHSVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineRGBANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineYCCANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CombineYUVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CropNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DefocusNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
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.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DisplaceNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DistanceMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_EllipseMaskNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FilterNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_FlipNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GammaNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_HueSaturationValueNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_IDMaskNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ImageNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InvertNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LensDistortionNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LuminanceMatteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapUVNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MapValueNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MathNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MixNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieClipNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MovieDistortionNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MuteNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_NormalNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_NormalizeNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_OutputFileNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RenderLayersNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_RotateNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ScaleNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateHSVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateRGBANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateYCCANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SeparateYUVANode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SetAlphaNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SocketProxyNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_Stabilize2dNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SwitchNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TextureNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TimeNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TonemapNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TransformNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TranslateNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ValueNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_VectorBlurNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_VectorCurveNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewerNode.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ZCombineNode.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_AntiAliasOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CropOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CurveBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DotproductOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_EllipseMaskOperation.h
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.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GammaOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareStreaksOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareThresholdOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_InvertOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapUVOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_NormalizeOperation.h
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_OutputFileOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_QualityStepHelper.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_RotateOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScaleOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TonemapOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TranslateOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_intern.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_bvh.h
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.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_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_result.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RadarSensor.h
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixGlareOperation.h
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FogGlowImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FogGlowImageOperation.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-47805
+
/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-47873
Modified: branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst 2012-06-14
08:58:23 UTC (rev 47873)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.types.rst 2012-06-14
09:39:54 UTC (rev 47874)
@@ -2692,7 +2692,7 @@
The angle of the cone (in degrees) with which to test.
- :type: float from 0 to 360
+ :type: float
.. attribute:: axis
@@ -2703,11 +2703,6 @@
KX_RADAR_AXIS_POS_X, KX_RADAR_AXIS_POS_Y, KX_RADAR_AXIS_POS_Z,
KX_RADAR_AXIS_NEG_X, KX_RADAR_AXIS_NEG_Y, KX_RADAR_AXIS_NEG_Z
- .. method:: getConeHeight()
-
- :return: The height of the cone with which to test.
- :rtype: float
-
.. class:: KX_RaySensor(SCA_ISensor)
A ray sensor detects the first object in a given direction.
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
2012-06-14 08:58:23 UTC (rev 47873)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
2012-06-14 09:39:54 UTC (rev 47874)
@@ -57,6 +57,12 @@
default='GPU_COMPATIBLE',
)
+ cls.progressive = BoolProperty(
+ name="Progressive",
+ description="Use progressive sampling of lighting",
+ default=True,
+ )
+
cls.samples = IntProperty(
name="Samples",
description="Number of samples to render for each pixel",
@@ -80,6 +86,49 @@
default=False,
)
+ cls.aa_samples = IntProperty(
+ name="AA Samples",
+ description="Number of antialiasing samples to render for each
pixel",
+ min=1, max=10000,
+ default=4,
+ )
+ cls.preview_aa_samples = IntProperty(
+ name="AA Samples",
+ description="Number of antialiasing samples to render in the
viewport, unlimited if 0",
+ min=0, max=10000,
+ default=4,
+ )
+ cls.diffuse_samples = IntProperty(
+ name="Diffuse Samples",
+ description="Number of diffuse bounce samples to render for
each AA sample",
+ min=1, max=10000,
+ default=1,
+ )
+ cls.glossy_samples = IntProperty(
+ name="Glossy Samples",
+ description="Number of glossy bounce samples to render for
each AA sample",
+ min=1, max=10000,
+ default=1,
+ )
+ cls.transmission_samples = IntProperty(
+ name="Transmission Samples",
+ description="Number of transmission bounce samples to render
for each AA sample",
+ min=1, max=10000,
+ default=1,
+ )
+ cls.ao_samples = IntProperty(
+ name="Ambient Occlusion Samples",
+ description="Number of ambient occlusion samples to render for
each AA sample",
+ min=1, max=10000,
+ default=1,
+ )
+ cls.mesh_light_samples = IntProperty(
+ name="Mesh Light Samples",
+ description="Number of mesh emission light samples to render
for each AA sample",
+ min=1, max=10000,
+ default=1,
+ )
+
cls.no_caustics = BoolProperty(
name="No Caustics",
description="Leave out caustics, resulting in a darker image
with less noise",
@@ -340,6 +389,12 @@
description="Lamp casts shadows",
default=True,
)
+ cls.samples = IntProperty(
+ name="Samples",
+ description="Number of light samples to render for each AA
sample",
+ min=1, max=10000,
+ default=1,
+ )
@classmethod
def unregister(cls):
@@ -365,6 +420,12 @@
min=4, max=8096,
default=256,
)
+ cls.samples = IntProperty(
+ name="Samples",
+ description="Number of light samples to render for each AA
sample",
+ min=1, max=10000,
+ default=4,
+ )
@classmethod
def unregister(cls):
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2012-06-14
08:58:23 UTC (rev 47873)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py 2012-06-14
09:39:54 UTC (rev 47874)
@@ -44,8 +44,8 @@
return rd.engine == 'CYCLES'
-class CyclesRender_PT_integrator(CyclesButtonsPanel, Panel):
- bl_label = "Integrator"
+class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
+ bl_label = "Sampling"
bl_options = {'DEFAULT_CLOSED'}
def draw(self, context):
@@ -54,6 +54,47 @@
scene = context.scene
cscene = scene.cycles
+ split = layout.split()
+
+ col = split.column()
+ sub = col.column()
+ sub.active = cscene.device == 'CPU'
+ sub.prop(cscene, "progressive")
+
+ sub = col.column(align=True)
+ sub.prop(cscene, "seed")
+ sub.prop(cscene, "sample_clamp")
+
+ if cscene.progressive or cscene.device != 'CPU':
+ col = split.column()
+ col.label(text="Samples:")
+ sub = col.column(align=True)
+ sub.prop(cscene, "samples", text="Render")
+ sub.prop(cscene, "preview_samples", text="Preview")
+ else:
+ sub.label(text="AA Samples:")
+ sub.prop(cscene, "aa_samples", text="Render")
+ sub.prop(cscene, "preview_aa_samples", text="Preview")
+
+ col = split.column()
+ col.label(text="Samples:")
+ sub = col.column(align=True)
+ sub.prop(cscene, "diffuse_samples", text="Diffuse")
+ sub.prop(cscene, "glossy_samples", text="Glossy")
+ sub.prop(cscene, "transmission_samples", text="Transmission")
+ sub.prop(cscene, "ao_samples", text="AO")
+ sub.prop(cscene, "mesh_light_samples", text="Mesh Light")
+
+class CyclesRender_PT_light_paths(CyclesButtonsPanel, Panel):
+ bl_label = "Light Paths"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ scene = context.scene
+ cscene = scene.cycles
+
row = layout.row(align=True)
row.menu("CYCLES_MT_integrator_presets",
text=bpy.types.CYCLES_MT_integrator_presets.bl_label)
row.operator("render.cycles_integrator_preset_add", text="",
icon="ZOOMIN")
@@ -62,12 +103,6 @@
split = layout.split()
col = split.column()
- sub = col.column(align=True)
- sub.label(text="Samples:")
- sub.prop(cscene, "samples", text="Render")
- sub.prop(cscene, "preview_samples", text="Preview")
- sub.prop(cscene, "seed")
- sub.prop(cscene, "sample_clamp")
sub = col.column(align=True)
sub.label("Transparency:")
@@ -75,6 +110,11 @@
sub.prop(cscene, "transparent_min_bounces", text="Min")
sub.prop(cscene, "use_transparent_shadows", text="Shadows")
+ col.separator()
+
+ col.prop(cscene, "no_caustics")
+ col.prop(cscene, "blur_glossy")
+
col = split.column()
sub = col.column(align=True)
@@ -83,17 +123,11 @@
sub.prop(cscene, "min_bounces", text="Min")
sub = col.column(align=True)
- sub.label(text="Light Paths:")
sub.prop(cscene, "diffuse_bounces", text="Diffuse")
sub.prop(cscene, "glossy_bounces", text="Glossy")
sub.prop(cscene, "transmission_bounces", text="Transmission")
- col.separator()
- col.prop(cscene, "no_caustics")
- col.prop(cscene, "blur_glossy")
-
-
class CyclesRender_PT_motion_blur(CyclesButtonsPanel, Panel):
bl_label = "Motion Blur"
bl_options = {'DEFAULT_CLOSED'}
@@ -467,6 +501,7 @@
lamp = context.lamp
clamp = lamp.cycles
+ cscene = context.scene.cycles
layout.prop(lamp, "type", expand=True)
@@ -485,6 +520,9 @@
sub.prop(lamp, "size", text="Size X")
sub.prop(lamp, "size_y", text="Size Y")
+ if not cscene.progressive and cscene.device == 'CPU':
+ col.prop(clamp, "samples")
+
col = split.column()
col.prop(clamp, "cast_shadow")
@@ -604,13 +642,16 @@
world = context.world
cworld = world.cycles
+ cscene = context.scene.cycles
col = layout.column()
col.prop(cworld, "sample_as_light")
- row = col.row()
- row.active = cworld.sample_as_light
- row.prop(cworld, "sample_map_resolution")
+ sub = col.row(align=True)
+ sub.active = cworld.sample_as_light
+ sub.prop(cworld, "sample_map_resolution")
+ if not cscene.progressive and cscene.device == 'CPU':
+ sub.prop(cworld, "samples")
class CyclesMaterial_PT_surface(CyclesButtonsPanel, Panel):
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_camera.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
