[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49110] branches/smoke2: Merge from trunk r48769-r49109
Daniel Genrich
daniel.genrich at gmx.net
Sun Jul 22 01:23:57 CEST 2012
Revision: 49110
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49110
Author: genscher
Date: 2012-07-21 23:23:56 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
Merge from trunk r48769-r49109
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48769
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49109
Modified Paths:
--------------
branches/smoke2/build_files/cmake/config/blender_lite.cmake
branches/smoke2/build_files/cmake/macros.cmake
branches/smoke2/doc/manpage/blender.1
branches/smoke2/intern/boolop/intern/BOP_CarveInterface.cpp
branches/smoke2/intern/bsp/intern/BSP_CSGMesh.cpp
branches/smoke2/intern/cycles/kernel/kernel_differential.h
branches/smoke2/intern/cycles/render/graph.cpp
branches/smoke2/intern/cycles/subd/subd_build.cpp
branches/smoke2/intern/cycles/util/util_cache.cpp
branches/smoke2/intern/cycles/util/util_path.cpp
branches/smoke2/intern/decimation/intern/LOD_QuadricEditor.cpp
branches/smoke2/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
branches/smoke2/intern/dualcon/intern/octree.cpp
branches/smoke2/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_DropTargetX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_SystemX11.h
branches/smoke2/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/smoke2/intern/ghost/intern/GHOST_WindowNULL.h
branches/smoke2/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowX11.cpp
branches/smoke2/intern/ghost/intern/GHOST_WindowX11.h
branches/smoke2/intern/guardedalloc/MEM_guardedalloc.h
branches/smoke2/intern/guardedalloc/intern/mallocn.c
branches/smoke2/intern/itasc/Scene.cpp
branches/smoke2/intern/memutil/MEM_CacheLimiter.h
branches/smoke2/intern/memutil/MEM_CacheLimiterC-Api.h
branches/smoke2/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/smoke2/intern/raskter/CMakeLists.txt
branches/smoke2/intern/raskter/raskter.c
branches/smoke2/intern/raskter/raskter.h
branches/smoke2/release/scripts/modules/bl_i18n_utils/merge_po.py
branches/smoke2/release/scripts/modules/bpy/path.py
branches/smoke2/release/scripts/startup/bl_operators/wm.py
branches/smoke2/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/smoke2/release/scripts/startup/bl_ui/space_clip.py
branches/smoke2/release/scripts/startup/bl_ui/space_info.py
branches/smoke2/release/scripts/startup/bl_ui/space_view3d.py
branches/smoke2/release/text/readme.html
branches/smoke2/source/blender/blenkernel/BKE_blender.h
branches/smoke2/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/smoke2/source/blender/blenkernel/BKE_mask.h
branches/smoke2/source/blender/blenkernel/BKE_mesh.h
branches/smoke2/source/blender/blenkernel/BKE_node.h
branches/smoke2/source/blender/blenkernel/BKE_object.h
branches/smoke2/source/blender/blenkernel/CMakeLists.txt
branches/smoke2/source/blender/blenkernel/intern/action.c
branches/smoke2/source/blender/blenkernel/intern/cdderivedmesh.c
branches/smoke2/source/blender/blenkernel/intern/collision.c
branches/smoke2/source/blender/blenkernel/intern/colortools.c
branches/smoke2/source/blender/blenkernel/intern/curve.c
branches/smoke2/source/blender/blenkernel/intern/depsgraph.c
branches/smoke2/source/blender/blenkernel/intern/displist.c
branches/smoke2/source/blender/blenkernel/intern/effect.c
branches/smoke2/source/blender/blenkernel/intern/fcurve.c
branches/smoke2/source/blender/blenkernel/intern/fmodifier.c
branches/smoke2/source/blender/blenkernel/intern/group.c
branches/smoke2/source/blender/blenkernel/intern/implicit.c
branches/smoke2/source/blender/blenkernel/intern/lattice.c
branches/smoke2/source/blender/blenkernel/intern/mask.c
branches/smoke2/source/blender/blenkernel/intern/mball.c
branches/smoke2/source/blender/blenkernel/intern/mesh.c
branches/smoke2/source/blender/blenkernel/intern/movieclip.c
branches/smoke2/source/blender/blenkernel/intern/multires.c
branches/smoke2/source/blender/blenkernel/intern/node.c
branches/smoke2/source/blender/blenkernel/intern/object.c
branches/smoke2/source/blender/blenkernel/intern/particle.c
branches/smoke2/source/blender/blenkernel/intern/particle_system.c
branches/smoke2/source/blender/blenkernel/intern/pointcache.c
branches/smoke2/source/blender/blenkernel/intern/scene.c
branches/smoke2/source/blender/blenkernel/intern/seqcache.c
branches/smoke2/source/blender/blenkernel/intern/seqeffects.c
branches/smoke2/source/blender/blenkernel/intern/sequencer.c
branches/smoke2/source/blender/blenkernel/intern/softbody.c
branches/smoke2/source/blender/blenkernel/intern/writeframeserver.c
branches/smoke2/source/blender/blenlib/BLI_kdopbvh.h
branches/smoke2/source/blender/blenlib/BLI_math_geom.h
branches/smoke2/source/blender/blenlib/BLI_memarena.h
branches/smoke2/source/blender/blenlib/BLI_mempool.h
branches/smoke2/source/blender/blenlib/BLI_rect.h
branches/smoke2/source/blender/blenlib/BLI_scanfill.h
branches/smoke2/source/blender/blenlib/BLI_string.h
branches/smoke2/source/blender/blenlib/BLI_threads.h
branches/smoke2/source/blender/blenlib/BLI_utildefines.h
branches/smoke2/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/smoke2/source/blender/blenlib/intern/DLRB_tree.c
branches/smoke2/source/blender/blenlib/intern/freetypefont.c
branches/smoke2/source/blender/blenlib/intern/lasso.c
branches/smoke2/source/blender/blenlib/intern/math_geom.c
branches/smoke2/source/blender/blenlib/intern/math_matrix.c
branches/smoke2/source/blender/blenlib/intern/math_rotation.c
branches/smoke2/source/blender/blenlib/intern/math_vector_inline.c
branches/smoke2/source/blender/blenlib/intern/noise.c
branches/smoke2/source/blender/blenlib/intern/path_util.c
branches/smoke2/source/blender/blenlib/intern/rct.c
branches/smoke2/source/blender/blenlib/intern/string.c
branches/smoke2/source/blender/blenlib/intern/threads.c
branches/smoke2/source/blender/blenlib/intern/voronoi.c
branches/smoke2/source/blender/blenloader/intern/readfile.c
branches/smoke2/source/blender/bmesh/bmesh_class.h
branches/smoke2/source/blender/bmesh/intern/bmesh_core.c
branches/smoke2/source/blender/bmesh/intern/bmesh_marking.c
branches/smoke2/source/blender/bmesh/intern/bmesh_marking.h
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.c
branches/smoke2/source/blender/bmesh/intern/bmesh_mesh.h
branches/smoke2/source/blender/bmesh/intern/bmesh_operator_api.h
branches/smoke2/source/blender/bmesh/intern/bmesh_operators.c
branches/smoke2/source/blender/bmesh/intern/bmesh_polygon.c
branches/smoke2/source/blender/bmesh/intern/bmesh_queries.c
branches/smoke2/source/blender/bmesh/intern/bmesh_structure.h
branches/smoke2/source/blender/bmesh/operators/bmo_bevel.c
branches/smoke2/source/blender/bmesh/operators/bmo_create.c
branches/smoke2/source/blender/bmesh/operators/bmo_dissolve.c
branches/smoke2/source/blender/bmesh/operators/bmo_dupe.c
branches/smoke2/source/blender/bmesh/operators/bmo_extrude.c
branches/smoke2/source/blender/bmesh/operators/bmo_hull.c
branches/smoke2/source/blender/bmesh/operators/bmo_inset.c
branches/smoke2/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/smoke2/source/blender/bmesh/operators/bmo_mirror.c
branches/smoke2/source/blender/bmesh/operators/bmo_primitive.c
branches/smoke2/source/blender/bmesh/operators/bmo_removedoubles.c
branches/smoke2/source/blender/bmesh/operators/bmo_subdivide.c
branches/smoke2/source/blender/bmesh/operators/bmo_triangulate.c
branches/smoke2/source/blender/bmesh/operators/bmo_utils.c
branches/smoke2/source/blender/bmesh/tools/BME_bevel.c
branches/smoke2/source/blender/collada/AnimationImporter.cpp
branches/smoke2/source/blender/collada/GeometryExporter.cpp
branches/smoke2/source/blender/collada/ImageExporter.cpp
branches/smoke2/source/blender/compositor/CMakeLists.txt
branches/smoke2/source/blender/compositor/COM_compositor.h
branches/smoke2/source/blender/compositor/SConscript
branches/smoke2/source/blender/compositor/intern/COM_CPUDevice.cpp
branches/smoke2/source/blender/compositor/intern/COM_Converter.cpp
branches/smoke2/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/smoke2/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/smoke2/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/smoke2/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/smoke2/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/smoke2/source/blender/compositor/intern/COM_MemoryProxy.h
branches/smoke2/source/blender/compositor/intern/COM_Node.h
branches/smoke2/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/smoke2/source/blender/compositor/intern/COM_NodeOperation.h
branches/smoke2/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/smoke2/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/smoke2/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.cpp
branches/smoke2/source/blender/compositor/intern/COM_SingleThreadedNodeOperation.h
branches/smoke2/source/blender/compositor/intern/COM_SocketReader.h
branches/smoke2/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/smoke2/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_KeyingNode.h
branches/smoke2/source/blender/compositor/nodes/COM_MathNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_MixNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/smoke2/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/smoke2/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/smoke2/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/smoke2/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_AntiAliasOperation.h
branches/smoke2/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_BokehImageOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BokehImageOperation.h
branches/smoke2/source/blender/compositor/operations/COM_BoxMaskOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BoxMaskOperation.h
branches/smoke2/source/blender/compositor/operations/COM_BrightnessOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_BrightnessOperation.h
branches/smoke2/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_CalculateMeanOperation.h
branches/smoke2/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ChangeHSVOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorCurveOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorRampOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorRampOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ColorSpillOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/smoke2/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/smoke2/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_CompositorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
branches/smoke2/source/blender/compositor/operations/COM_CropOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_CropOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DisplaceOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DisplaceOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DotproductOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DotproductOperation.h
branches/smoke2/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
branches/smoke2/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_EllipseMaskOperation.h
branches/smoke2/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_FlipOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_FlipOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GammaCorrectOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GammaCorrectOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GammaOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GammaOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GlareBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GlareThresholdOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_GlareThresholdOperation.h
branches/smoke2/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
branches/smoke2/source/blender/compositor/operations/COM_IDMaskOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_IDMaskOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ImageOperation.h
branches/smoke2/source/blender/compositor/operations/COM_InvertOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_InvertOperation.h
branches/smoke2/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_KeyingBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/smoke2/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/smoke2/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_KeyingOperation.h
branches/smoke2/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/smoke2/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MapUVOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MapValueOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MapValueOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MaskOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixAddOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixBlendOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixColorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixGlareOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixHueOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MixValueOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/smoke2/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_MultilayerImageOperation.h
branches/smoke2/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_NormalizeOperation.h
branches/smoke2/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/smoke2/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/smoke2/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/smoke2/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_PreviewOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/smoke2/source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp
branches/smoke2/source/blender/compositor/operations/COM_RenderLayersAlphaProg.h
branches/smoke2/source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp
branches/smoke2/source/blender/compositor/operations/COM_RenderLayersBaseProg.h
branches/smoke2/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_RotateOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ScaleOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SeparateChannelOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SetAlphaOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SetColorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SetColorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SetSamplerOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SetValueOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SetValueOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SetVectorOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SocketProxyOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SocketProxyOperation.h
branches/smoke2/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/smoke2/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_TextureOperation.h
branches/smoke2/source/blender/compositor/operations/COM_TonemapOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_TonemapOperation.h
branches/smoke2/source/blender/compositor/operations/COM_TranslateOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_TranslateOperation.h
branches/smoke2/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_VectorBlurOperation.h
branches/smoke2/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_VectorCurveOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ViewerOperation.h
branches/smoke2/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/smoke2/source/blender/compositor/operations/COM_ZCombineOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/smoke2/source/blender/editors/animation/anim_channels_defines.c
branches/smoke2/source/blender/editors/animation/anim_deps.c
branches/smoke2/source/blender/editors/animation/anim_filter.c
branches/smoke2/source/blender/editors/animation/anim_intern.h
branches/smoke2/source/blender/editors/animation/anim_ipo_utils.c
branches/smoke2/source/blender/editors/animation/anim_markers.c
branches/smoke2/source/blender/editors/animation/anim_ops.c
branches/smoke2/source/blender/editors/animation/keyframes_draw.c
branches/smoke2/source/blender/editors/animation/keyframes_edit.c
branches/smoke2/source/blender/editors/animation/keyframing.c
branches/smoke2/source/blender/editors/armature/editarmature.c
branches/smoke2/source/blender/editors/armature/editarmature_retarget.c
branches/smoke2/source/blender/editors/armature/editarmature_sketch.c
branches/smoke2/source/blender/editors/armature/poseobject.c
branches/smoke2/source/blender/editors/armature/reeb.c
branches/smoke2/source/blender/editors/curve/editcurve.c
branches/smoke2/source/blender/editors/gpencil/drawgpencil.c
branches/smoke2/source/blender/editors/include/ED_mesh.h
branches/smoke2/source/blender/editors/include/ED_numinput.h
branches/smoke2/source/blender/editors/include/ED_object.h
branches/smoke2/source/blender/editors/include/UI_interface.h
branches/smoke2/source/blender/editors/include/UI_view2d.h
branches/smoke2/source/blender/editors/interface/interface.c
branches/smoke2/source/blender/editors/interface/interface_anim.c
branches/smoke2/source/blender/editors/interface/interface_draw.c
branches/smoke2/source/blender/editors/interface/interface_handlers.c
branches/smoke2/source/blender/editors/interface/interface_icons.c
branches/smoke2/source/blender/editors/interface/interface_intern.h
branches/smoke2/source/blender/editors/interface/interface_panel.c
branches/smoke2/source/blender/editors/interface/interface_templates.c
branches/smoke2/source/blender/editors/interface/resources.c
branches/smoke2/source/blender/editors/interface/view2d.c
branches/smoke2/source/blender/editors/interface/view2d_ops.c
branches/smoke2/source/blender/editors/mask/mask_draw.c
branches/smoke2/source/blender/editors/mask/mask_edit.c
branches/smoke2/source/blender/editors/mask/mask_intern.h
branches/smoke2/source/blender/editors/mask/mask_ops.c
branches/smoke2/source/blender/editors/mask/mask_select.c
branches/smoke2/source/blender/editors/mesh/editmesh_knife.c
branches/smoke2/source/blender/editors/mesh/editmesh_loopcut.c
branches/smoke2/source/blender/editors/mesh/editmesh_select.c
branches/smoke2/source/blender/editors/mesh/editmesh_tools.c
branches/smoke2/source/blender/editors/mesh/editmesh_utils.c
branches/smoke2/source/blender/editors/mesh/meshtools.c
branches/smoke2/source/blender/editors/object/object_add.c
branches/smoke2/source/blender/editors/object/object_group.c
branches/smoke2/source/blender/editors/object/object_lattice.c
branches/smoke2/source/blender/editors/object/object_relations.c
branches/smoke2/source/blender/editors/object/object_vgroup.c
branches/smoke2/source/blender/editors/physics/physics_fluid.c
branches/smoke2/source/blender/editors/screen/area.c
branches/smoke2/source/blender/editors/screen/screen_edit.c
branches/smoke2/source/blender/editors/screen/screen_intern.h
branches/smoke2/source/blender/editors/screen/screen_ops.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_image.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_ops.c
branches/smoke2/source/blender/editors/sculpt_paint/paint_utils.c
branches/smoke2/source/blender/editors/sculpt_paint/sculpt.c
branches/smoke2/source/blender/editors/space_clip/clip_ops.c
branches/smoke2/source/blender/editors/space_clip/space_clip.c
branches/smoke2/source/blender/editors/space_clip/tracking_select.c
branches/smoke2/source/blender/editors/space_file/file_ops.c
branches/smoke2/source/blender/editors/space_image/image_buttons.c
branches/smoke2/source/blender/editors/space_image/image_draw.c
branches/smoke2/source/blender/editors/space_node/CMakeLists.txt
branches/smoke2/source/blender/editors/space_node/SConscript
branches/smoke2/source/blender/editors/space_node/drawnode.c
branches/smoke2/source/blender/editors/space_node/node_draw.c
branches/smoke2/source/blender/editors/space_node/node_edit.c
branches/smoke2/source/blender/editors/space_node/node_intern.h
branches/smoke2/source/blender/editors/space_node/node_select.c
branches/smoke2/source/blender/editors/space_node/node_state.c
branches/smoke2/source/blender/editors/space_node/space_node.c
branches/smoke2/source/blender/editors/space_outliner/outliner_edit.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_edit.c
branches/smoke2/source/blender/editors/space_sequencer/sequencer_select.c
branches/smoke2/source/blender/editors/space_text/text_ops.c
branches/smoke2/source/blender/editors/space_view3d/drawmesh.c
branches/smoke2/source/blender/editors/space_view3d/drawobject.c
branches/smoke2/source/blender/editors/space_view3d/view3d_buttons.c
branches/smoke2/source/blender/editors/space_view3d/view3d_draw.c
branches/smoke2/source/blender/editors/space_view3d/view3d_fly.c
branches/smoke2/source/blender/editors/space_view3d/view3d_select.c
branches/smoke2/source/blender/editors/space_view3d/view3d_view.c
branches/smoke2/source/blender/editors/transform/transform.c
branches/smoke2/source/blender/editors/transform/transform_constraints.c
branches/smoke2/source/blender/editors/transform/transform_conversions.c
branches/smoke2/source/blender/editors/transform/transform_generics.c
branches/smoke2/source/blender/editors/transform/transform_manipulator.c
branches/smoke2/source/blender/editors/transform/transform_orientations.c
branches/smoke2/source/blender/editors/transform/transform_snap.c
branches/smoke2/source/blender/editors/util/numinput.c
branches/smoke2/source/blender/editors/uvedit/uvedit_ops.c
branches/smoke2/source/blender/gpu/intern/gpu_buffers.c
branches/smoke2/source/blender/gpu/intern/gpu_draw.c
branches/smoke2/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/smoke2/source/blender/imbuf/IMB_moviecache.h
branches/smoke2/source/blender/imbuf/intern/imageprocess.c
branches/smoke2/source/blender/imbuf/intern/jp2.c
branches/smoke2/source/blender/imbuf/intern/jpeg.c
branches/smoke2/source/blender/imbuf/intern/moviecache.c
branches/smoke2/source/blender/imbuf/intern/scaling.c
branches/smoke2/source/blender/makesdna/DNA_anim_types.h
branches/smoke2/source/blender/makesdna/DNA_mask_types.h
branches/smoke2/source/blender/makesdna/DNA_node_types.h
branches/smoke2/source/blender/makesdna/DNA_texture_types.h
branches/smoke2/source/blender/makesdna/intern/dna_genfile.c
branches/smoke2/source/blender/makesrna/RNA_enum_types.h
branches/smoke2/source/blender/makesrna/RNA_types.h
branches/smoke2/source/blender/makesrna/intern/rna_fcurve.c
branches/smoke2/source/blender/makesrna/intern/rna_lattice.c
branches/smoke2/source/blender/makesrna/intern/rna_mask.c
branches/smoke2/source/blender/makesrna/intern/rna_nla.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree.c
branches/smoke2/source/blender/makesrna/intern/rna_nodetree_types.h
branches/smoke2/source/blender/makesrna/intern/rna_object_api.c
branches/smoke2/source/blender/makesrna/intern/rna_scene_api.c
branches/smoke2/source/blender/makesrna/intern/rna_sequencer.c
branches/smoke2/source/blender/makesrna/intern/rna_space.c
branches/smoke2/source/blender/makesrna/intern/rna_texture.c
branches/smoke2/source/blender/modifiers/intern/MOD_array.c
branches/smoke2/source/blender/modifiers/intern/MOD_bevel.c
branches/smoke2/source/blender/modifiers/intern/MOD_cast.c
branches/smoke2/source/blender/modifiers/intern/MOD_edgesplit.c
branches/smoke2/source/blender/modifiers/intern/MOD_particleinstance.c
branches/smoke2/source/blender/modifiers/intern/MOD_skin.c
branches/smoke2/source/blender/modifiers/intern/MOD_solidify.c
branches/smoke2/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/smoke2/source/blender/nodes/CMakeLists.txt
branches/smoke2/source/blender/nodes/NOD_composite.h
branches/smoke2/source/blender/nodes/composite/node_composite_tree.c
branches/smoke2/source/blender/nodes/composite/node_composite_util.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/smoke2/source/blender/nodes/shader/node_shader_util.c
branches/smoke2/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_ops.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/smoke2/source/blender/python/bmesh/bmesh_py_types_select.c
branches/smoke2/source/blender/python/generic/bpy_internal_import.c
branches/smoke2/source/blender/python/generic/bpy_internal_import.h
branches/smoke2/source/blender/python/generic/idprop_py_api.c
branches/smoke2/source/blender/python/generic/py_capi_utils.c
branches/smoke2/source/blender/python/generic/py_capi_utils.h
branches/smoke2/source/blender/python/intern/bpy_operator.c
branches/smoke2/source/blender/python/intern/bpy_props.c
branches/smoke2/source/blender/python/intern/bpy_rna.c
branches/smoke2/source/blender/python/intern/bpy_rna_array.c
branches/smoke2/source/blender/python/mathutils/mathutils_Color.c
branches/smoke2/source/blender/python/mathutils/mathutils_Matrix.c
branches/smoke2/source/blender/python/mathutils/mathutils_Vector.c
branches/smoke2/source/blender/python/mathutils/mathutils_noise.c
branches/smoke2/source/blender/quicktime/apple/qtkit_export.m
branches/smoke2/source/blender/quicktime/apple/qtkit_import.m
branches/smoke2/source/blender/quicktime/apple/quicktime_import.c
branches/smoke2/source/blender/render/intern/include/zbuf.h
branches/smoke2/source/blender/render/intern/raytrace/reorganize.h
branches/smoke2/source/blender/render/intern/source/convertblender.c
branches/smoke2/source/blender/render/intern/source/imagetexture.c
branches/smoke2/source/blender/render/intern/source/initrender.c
branches/smoke2/source/blender/render/intern/source/rayshade.c
branches/smoke2/source/blender/render/intern/source/render_texture.c
branches/smoke2/source/blender/render/intern/source/renderdatabase.c
branches/smoke2/source/blender/render/intern/source/shadbuf.c
branches/smoke2/source/blender/render/intern/source/strand.c
branches/smoke2/source/blender/render/intern/source/sunsky.c
branches/smoke2/source/blender/render/intern/source/volumetric.c
branches/smoke2/source/blender/render/intern/source/zbuf.c
branches/smoke2/source/blender/windowmanager/CMakeLists.txt
branches/smoke2/source/blender/windowmanager/SConscript
branches/smoke2/source/blender/windowmanager/intern/wm_draw.c
branches/smoke2/source/blender/windowmanager/intern/wm_event_system.c
branches/smoke2/source/blender/windowmanager/intern/wm_gesture.c
branches/smoke2/source/blender/windowmanager/intern/wm_init_exit.c
branches/smoke2/source/blender/windowmanager/intern/wm_operators.c
branches/smoke2/source/creator/CMakeLists.txt
branches/smoke2/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/smoke2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/smoke2/source/gameengine/Converter/BL_ActionActuator.cpp
branches/smoke2/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/smoke2/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/smoke2/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/smoke2/source/gameengine/Converter/BL_MeshDeformer.h
branches/smoke2/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/smoke2/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/smoke2/source/gameengine/Expressions/ListValue.h
branches/smoke2/source/gameengine/Expressions/VoidValue.h
branches/smoke2/source/gameengine/GameLogic/SCA_IObject.cpp
branches/smoke2/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/smoke2/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/smoke2/source/gameengine/Ketsji/BL_Texture.cpp
branches/smoke2/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/smoke2/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/smoke2/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_GameActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_GameObject.cpp
branches/smoke2/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_PyMath.h
branches/smoke2/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_SceneActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/smoke2/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/smoke2/source/gameengine/Ketsji/KX_WorldInfo.h
branches/smoke2/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/smoke2/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/smoke2/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/smoke2/source/gameengine/Rasterizer/RAS_Deformer.h
branches/smoke2/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/smoke2/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/smoke2/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/smoke2/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/smoke2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/smoke2/source/gameengine/SceneGraph/SG_BBox.cpp
branches/smoke2/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/smoke2/source/gameengine/SceneGraph/SG_Tree.cpp
branches/smoke2/source/gameengine/VideoTexture/ImageBase.cpp
branches/smoke2/source/gameengine/VideoTexture/ImageRender.cpp
branches/smoke2/source/gameengine/VideoTexture/Texture.cpp
branches/smoke2/source/gameengine/VideoTexture/VideoBase.h
Added Paths:
-----------
branches/smoke2/intern/raskter/raskter_kdtree.c
branches/smoke2/intern/raskter/raskter_kdtree.h
branches/smoke2/intern/raskter/raskter_mt.c
branches/smoke2/source/blender/blenkernel/intern/mask_rasterize.c
branches/smoke2/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/smoke2/source/blender/compositor/nodes/COM_TrackPositionNode.h
branches/smoke2/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/smoke2/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/smoke2/source/blender/nodes/composite/nodes/node_composite_trackpos.c
Property Changed:
----------------
branches/smoke2/source/blender/editors/interface/interface.c
branches/smoke2/source/blender/editors/space_outliner/
Modified: branches/smoke2/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/smoke2/build_files/cmake/config/blender_lite.cmake 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/build_files/cmake/config/blender_lite.cmake 2012-07-21 23:23:56 UTC (rev 49110)
@@ -17,6 +17,7 @@
set(WITH_LIBMV OFF CACHE FORCE BOOL)
set(WITH_CARVE OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
+set(WITH_COMPOSITOR OFF CACHE FORCE BOOL)
set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
Modified: branches/smoke2/build_files/cmake/macros.cmake
===================================================================
--- branches/smoke2/build_files/cmake/macros.cmake 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/build_files/cmake/macros.cmake 2012-07-21 23:23:56 UTC (rev 49110)
@@ -23,6 +23,25 @@
#
# ***** END GPL LICENSE BLOCK *****
+macro(list_insert_after
+ list_id item_check item_add
+ )
+ set(_index)
+ list(FIND ${list_id} "${item_check}" _index)
+ math(EXPR _index "${_index} + 1")
+ list(INSERT ${list_id} "${_index}" ${item_add})
+ unset(_index)
+endmacro()
+
+macro(list_insert_before
+ list_id item_check item_add
+ )
+ set(_index)
+ list(FIND ${list_id} "${item_check}" _index)
+ list(INSERT ${list_id} "${_index}" ${item_add})
+ unset(_index)
+endmacro()
+
# foo_bar.spam --> foo_barMySuffix.spam
macro(file_suffix
file_name_new file_name file_suffix
Modified: branches/smoke2/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/smoke2/intern/boolop/intern/BOP_CarveInterface.cpp
===================================================================
--- branches/smoke2/intern/boolop/intern/BOP_CarveInterface.cpp 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/boolop/intern/BOP_CarveInterface.cpp 2012-07-21 23:23:56 UTC (rev 49110)
@@ -547,13 +547,32 @@
return 0;
}
-static bool Carve_checkDegeneratedFace(MeshSet<3>::face_t *face)
+static bool Carve_checkDegeneratedFace(std::map<MeshSet<3>::vertex_t*, uint> *vertexToIndex_map, MeshSet<3>::face_t *face)
{
/* only tris and quads for now */
if (face->n_edges == 3) {
+ uint v1, v2, v3;
+
+ v1 = vertexToIndex_map->find(face->edge->prev->vert)->second;
+ v2 = vertexToIndex_map->find(face->edge->vert)->second;
+ v3 = vertexToIndex_map->find(face->edge->next->vert)->second;
+
+ if (v1 == v2 || v2 == v3 || v1 == v3)
+ return true;
+
return triangleArea(face->edge->prev->vert->v, face->edge->vert->v, face->edge->next->vert->v) < DBL_EPSILON;
}
else if (face->n_edges == 4) {
+ uint v1, v2, v3, v4;
+
+ v1 = vertexToIndex_map->find(face->edge->prev->vert)->second;
+ v2 = vertexToIndex_map->find(face->edge->vert)->second;
+ v3 = vertexToIndex_map->find(face->edge->next->vert)->second;
+ v4 = vertexToIndex_map->find(face->edge->next->next->vert)->second;
+
+ if (v1 == v2 || v1 == v3 || v1 == v4 || v2 == v3 || v2 == v4 || v3 == v4)
+ return true;
+
return triangleArea(face->edge->vert->v, face->edge->next->vert->v, face->edge->next->next->vert->v) +
triangleArea(face->edge->prev->vert->v, face->edge->vert->v, face->edge->next->next->vert->v) < DBL_EPSILON;
}
@@ -595,8 +614,14 @@
MeshSet<3>::face_iter face_iter = poly->faceBegin();
for (i = 0; face_iter != poly->faceEnd(); ++face_iter, ++i) {
MeshSet<3>::face_t *f = *face_iter;
+
+ if (Carve_checkDegeneratedFace(&vertexToIndex_map, f))
+ continue;
+
ofaces[oface_num.getAttribute(f)].push_back(i);
+
MeshSet<3>::face_t::edge_iter_t edge_iter = f->begin();
+
for (; edge_iter != f->end(); ++edge_iter) {
int index = vertexToIndex_map[edge_iter->vert];
vi[index].push_back(i);
@@ -659,36 +684,27 @@
}
}
- bool degenerativeFace = false;
+ // add all information except vertices to the output mesh
+ outputMesh->FaceSet().push_back(BSP_MFace());
+ BSP_MFace& outFace = outputMesh->FaceSet().back();
+ outFace.m_verts.clear();
+ outFace.m_plane.setValue(f->plane.N.v);
+ outFace.m_orig_face = orig;
- if (!result) {
- /* merged triangles are already checked for degenerative quad */
- degenerativeFace = Carve_checkDegeneratedFace(f);
- }
-
- if (!degenerativeFace) {
- // add all information except vertices to the output mesh
- outputMesh->FaceSet().push_back(BSP_MFace());
- BSP_MFace& outFace = outputMesh->FaceSet().back();
- outFace.m_verts.clear();
- outFace.m_plane.setValue(f->plane.N.v);
- outFace.m_orig_face = orig;
-
- // if we merged faces, use the list of common vertices; otherwise
- // use the faces's vertices
- if (result) {
- // make quat using verts stored in result
- outFace.m_verts.push_back(quadverts[0]);
- outFace.m_verts.push_back(quadverts[1]);
- outFace.m_verts.push_back(quadverts[2]);
- outFace.m_verts.push_back(quadverts[3]);
- } else {
- MeshSet<3>::face_t::edge_iter_t edge_iter = f->begin();
- for (; edge_iter != f->end(); ++edge_iter) {
- //int index = ofacevert_num.getAttribute(f, edge_iter.idx());
- int index = vertexToIndex_map[edge_iter->vert];
- outFace.m_verts.push_back( index );
- }
+ // if we merged faces, use the list of common vertices; otherwise
+ // use the faces's vertices
+ if (result) {
+ // make quat using verts stored in result
+ outFace.m_verts.push_back(quadverts[0]);
+ outFace.m_verts.push_back(quadverts[1]);
+ outFace.m_verts.push_back(quadverts[2]);
+ outFace.m_verts.push_back(quadverts[3]);
+ } else {
+ MeshSet<3>::face_t::edge_iter_t edge_iter = f->begin();
+ for (; edge_iter != f->end(); ++edge_iter) {
+ //int index = ofacevert_num.getAttribute(f, edge_iter.idx());
+ int index = vertexToIndex_map[edge_iter->vert];
+ outFace.m_verts.push_back( index );
}
}
}
Modified: branches/smoke2/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/smoke2/intern/bsp/intern/BSP_CSGMesh.cpp 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/bsp/intern/BSP_CSGMesh.cpp 2012-07-21 23:23:56 UTC (rev 49110)
@@ -486,7 +486,7 @@
BSP_MEdge &e = edges[*e_it];
// iterate through the faces of this edge - push unselected
- // edges to ouput and then select the edge
+ // edges to output and then select the edge
vector<BSP_FaceInd>::const_iterator e_faces_end = e.m_faces.end();
vector<BSP_FaceInd>::iterator e_faces_it = e.m_faces.begin();
Modified: branches/smoke2/intern/cycles/kernel/kernel_differential.h
===================================================================
--- branches/smoke2/intern/cycles/kernel/kernel_differential.h 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/cycles/kernel/kernel_differential.h 2012-07-21 23:23:56 UTC (rev 49110)
@@ -22,7 +22,7 @@
__device void differential_transfer(differential3 *dP_, const differential3 dP, float3 D, const differential3 dD, float3 Ng, float t)
{
- /* ray differential transfer through homogenous medium, to
+ /* ray differential transfer through homogeneous medium, to
* compute dPdx/dy at a shading point from the incoming ray */
float3 tmp = D/dot(D, Ng);
Modified: branches/smoke2/intern/cycles/render/graph.cpp
===================================================================
--- branches/smoke2/intern/cycles/render/graph.cpp 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/cycles/render/graph.cpp 2012-07-21 23:23:56 UTC (rev 49110)
@@ -187,7 +187,10 @@
if(from->type != to->type) {
/* for closures we can't do automatic conversion */
if(from->type == SHADER_SOCKET_CLOSURE || to->type == SHADER_SOCKET_CLOSURE) {
- fprintf(stderr, "ShaderGraph connect: can only connect closure to closure.\n");
+ fprintf(stderr, "ShaderGraph connect: can only connect closure to closure "
+ "(ShaderNode:%s, ShaderOutput:%s , type:%d -> to ShaderNode:%s, ShaderInput:%s, type:%d).\n",
+ from->parent->name.c_str(), from->name, (int)from->type,
+ to->parent->name.c_str(), to->name, (int)to->type);
return;
}
Modified: branches/smoke2/intern/cycles/subd/subd_build.cpp
===================================================================
--- branches/smoke2/intern/cycles/subd/subd_build.cpp 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/cycles/subd/subd_build.cpp 2012-07-21 23:23:56 UTC (rev 49110)
@@ -117,7 +117,7 @@
memcpy(patch->hull, position, sizeof(float3)*20);
return patch;
}
- else if(face->num_edges() == 4) {
+ else if(face->num_edges() == 4) {
GregoryQuadPatch *patch = new GregoryQuadPatch();
memcpy(patch->hull, position, sizeof(float3)*20);
return patch;
@@ -644,7 +644,7 @@
hull = lpatch->hull;
patch = lpatch;
}
- else if(face->num_edges() == 4) {
+ else if(face->num_edges() == 4) {
LinearQuadPatch *lpatch = new LinearQuadPatch();
hull = lpatch->hull;
patch = lpatch;
Modified: branches/smoke2/intern/cycles/util/util_cache.cpp
===================================================================
--- branches/smoke2/intern/cycles/util/util_cache.cpp 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/cycles/util/util_cache.cpp 2012-07-21 23:23:56 UTC (rev 49110)
@@ -26,8 +26,6 @@
#include "util_path.h"
#include "util_types.h"
-#define BOOST_FILESYSTEM_VERSION 2
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -117,7 +115,7 @@
boost::filesystem::directory_iterator it(dir), it_end;
for(; it != it_end; it++) {
- string filename = it->path().filename();
+ string filename = it->path().filename().string();
if(boost::starts_with(filename, name))
if(except.find(filename) == except.end())
Modified: branches/smoke2/intern/cycles/util/util_path.cpp
===================================================================
--- branches/smoke2/intern/cycles/util/util_path.cpp 2012-07-21 22:58:08 UTC (rev 49109)
+++ branches/smoke2/intern/cycles/util/util_path.cpp 2012-07-21 23:23:56 UTC (rev 49110)
@@ -26,8 +26,6 @@
#include <stdio.h>
-#define BOOST_FILESYSTEM_VERSION 2
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -60,7 +58,7 @@
string path_filename(const string& path)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list