[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48604] branches/soc-2012-fried_chicken: Merge with trunk r48602
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Wed Jul 4 19:15:05 CEST 2012
Revision: 48604
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48604
Author: miikah
Date: 2012-07-04 17:15:05 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Merge with trunk r48602
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48602
Modified Paths:
--------------
branches/soc-2012-fried_chicken/CMakeLists.txt
branches/soc-2012-fried_chicken/GNUmakefile
branches/soc-2012-fried_chicken/build_files/cmake/macros.cmake
branches/soc-2012-fried_chicken/build_files/scons/config/win32-vc-config.py
branches/soc-2012-fried_chicken/build_files/scons/config/win64-vc-config.py
branches/soc-2012-fried_chicken/build_files/scons/tools/btools.py
branches/soc-2012-fried_chicken/doc/build_systems/scons-dev.txt
branches/soc-2012-fried_chicken/doc/build_systems/scons.txt
branches/soc-2012-fried_chicken/doc/guides/interface_API.txt
branches/soc-2012-fried_chicken/doc/python_api/examples/bpy.ops.1.py
branches/soc-2012-fried_chicken/doc/python_api/examples/bpy.ops.2.py
branches/soc-2012-fried_chicken/doc/python_api/examples/bpy.ops.py
branches/soc-2012-fried_chicken/doc/python_api/rst/bge.render.rst
branches/soc-2012-fried_chicken/doc/python_api/rst/bge.types.rst
branches/soc-2012-fried_chicken/extern/carve/include/carve/csg.hpp
branches/soc-2012-fried_chicken/extern/carve/include/carve/polyline_decl.hpp
branches/soc-2012-fried_chicken/extern/carve/include/carve/rtree.hpp
branches/soc-2012-fried_chicken/extern/carve/lib/csg_data.hpp
branches/soc-2012-fried_chicken/extern/carve/lib/csg_detail.hpp
branches/soc-2012-fried_chicken/extern/carve/lib/intersect.cpp
branches/soc-2012-fried_chicken/extern/carve/patches/strict_flags.patch
branches/soc-2012-fried_chicken/intern/cycles/blender/addon/properties.py
branches/soc-2012-fried_chicken/intern/cycles/render/image.cpp
branches/soc-2012-fried_chicken/intern/cycles/render/image.h
branches/soc-2012-fried_chicken/intern/cycles/render/nodes.cpp
branches/soc-2012-fried_chicken/intern/ghost/GHOST_C-api.h
branches/soc-2012-fried_chicken/intern/ghost/GHOST_ISystem.h
branches/soc-2012-fried_chicken/intern/ghost/GHOST_IWindow.h
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_EventManager.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_System.h
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_TimerManager.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_WindowManager.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2012-fried_chicken/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2012-fried_chicken/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2012-fried_chicken/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2012-fried_chicken/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-fried_chicken/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2012-fried_chicken/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-fried_chicken/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2012-fried_chicken/intern/smoke/intern/MERSENNETWISTER.h
branches/soc-2012-fried_chicken/intern/smoke/intern/smoke_API.cpp
branches/soc-2012-fried_chicken/intern/string/STR_String.h
branches/soc-2012-fried_chicken/intern/string/intern/STR_String.cpp
branches/soc-2012-fried_chicken/intern/utfconv/utf_winfunc.c
branches/soc-2012-fried_chicken/release/scripts/modules/addon_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/animsys_refactor.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy/ops.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy/utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_extras/__init__.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2012-fried_chicken/release/scripts/modules/bpyml_ui.py
branches/soc-2012-fried_chicken/release/scripts/modules/console_python.py
branches/soc-2012-fried_chicken/release/scripts/modules/rna_info.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/image.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/mesh.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/object.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/object_align.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_file_export.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_file_import.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_mesh_add.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_modal.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_modal_draw.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_modal_timer.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_modal_view3d.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_node.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_simple.py
branches/soc-2012-fried_chicken/release/scripts/templates/operator_uv.py
branches/soc-2012-fried_chicken/source/SConscript
branches/soc-2012-fried_chicken/source/blender/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/SConscript
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_action.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_anim.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_global.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_image.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_material.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mesh.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_modifier.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/action.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/anim.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/armature.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/collision.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/effect.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/fcurve.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/image.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/key.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/material.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/modifier.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/nla.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/object.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/unit.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_fileops.h
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/fileops.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/path_util.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/scanfill.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/storage.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/threads.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/time.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/voronoi.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/writefile.c
branches/soc-2012-fried_chicken/source/blender/bmesh/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_edgesplit.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2012-fried_chicken/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2012-fried_chicken/source/blender/collada/MeshImporter.cpp
branches/soc-2012-fried_chicken/source/blender/collada/SceneExporter.cpp
branches/soc-2012-fried_chicken/source/blender/collada/collada_utils.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/compositor/COM_compositor.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Converter.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_MemoryProxy.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_Node.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_NodeBase.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_ColorToBWNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_FilterNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_MapValueNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChangeHSVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ChromaMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ColorSpillOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DistanceMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MapValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixAddOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBlendOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixBurnOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixColorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDarkenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDifferenceOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDivideOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixDodgeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixGlareOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixHueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixLightenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixLinearLightOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixMultiplyOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixOverlayOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSaturationOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixScreenOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSoftLightOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixSubtractOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MixValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RenderLayersImageProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetAlphaOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetSamplerOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ZCombineOperation.h
branches/soc-2012-fried_chicken/source/blender/editors/animation/drivers.c
branches/soc-2012-fried_chicken/source/blender/editors/animation/keyframing.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/armature_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/armature/armature_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/editarmature.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/meshlaplacian.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/poseSlide.c
branches/soc-2012-fried_chicken/source/blender/editors/armature/poselib.c
branches/soc-2012-fried_chicken/source/blender/editors/curve/editcurve.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2012-fried_chicken/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_node.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_screen_types.h
branches/soc-2012-fried_chicken/source/blender/editors/include/ED_transform.h
branches/soc-2012-fried_chicken/source/blender/editors/include/UI_view2d.h
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_templates.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/resources.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/view2d.c
branches/soc-2012-fried_chicken/source/blender/editors/io/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/editors/io/io_collada.c
branches/soc-2012-fried_chicken/source/blender/editors/io/io_ops.h
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_shapekey.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2012-fried_chicken/source/blender/editors/mesh/meshtools.c
branches/soc-2012-fried_chicken/source/blender/editors/metaball/mball_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_bake.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_group.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_modifier.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_select.c
branches/soc-2012-fried_chicken/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-fried_chicken/source/blender/editors/render/render_opengl.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/screen/screen_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-fried_chicken/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/file_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/space_file/file_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/space_file.c
branches/soc-2012-fried_chicken/source/blender/editors/space_graph/graph_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_graph/space_graph.c
branches/soc-2012-fried_chicken/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_info/info_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_nla/nla_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/drawnode.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/node_templates.c
branches/soc-2012-fried_chicken/source/blender/editors/space_node/space_node.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2012-fried_chicken/source/blender/editors/space_text/text_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform.h
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_constraints.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_snap.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-fried_chicken/source/blender/gpu/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/gpu/GPU_draw.h
branches/soc-2012-fried_chicken/source/blender/gpu/SConscript
branches/soc-2012-fried_chicken/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-fried_chicken/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2012-fried_chicken/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/cineon/dpxfile.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/imbuf.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/indexer.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/jp2.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/tiff.c
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_action_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_anim_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_armature_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_curve_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_image_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_object_force.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_object_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2012-fried_chicken/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2012-fried_chicken/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/makesrna.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_animation.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_boid.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_curve.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_define.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_key.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_main.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_material.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_pose.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_texture.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_ui.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_wm.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_world.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_array.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-fried_chicken/source/blender/nodes/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/nodes/SConscript
branches/soc-2012-fried_chicken/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2012-fried_chicken/source/blender/nodes/intern/node_socket.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/node_texture_util.c
branches/soc-2012-fried_chicken/source/blender/nodes/texture/node_texture_util.h
branches/soc-2012-fried_chicken/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2012-fried_chicken/source/blender/opencl/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/python/bmesh/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_operator.c
branches/soc-2012-fried_chicken/source/blender/python/intern/bpy_rna.c
branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2012-fried_chicken/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2012-fried_chicken/source/blender/render/intern/raytrace/bvh.h
branches/soc-2012-fried_chicken/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/soc-2012-fried_chicken/source/blender/render/intern/source/convertblender.c
branches/soc-2012-fried_chicken/source/blender/render/intern/source/render_result.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/WM_api.h
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/intern/wm_window.c
branches/soc-2012-fried_chicken/source/blender/windowmanager/wm_window.h
branches/soc-2012-fried_chicken/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-fried_chicken/source/creator/CMakeLists.txt
branches/soc-2012-fried_chicken/source/creator/creator.c
branches/soc-2012-fried_chicken/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2012-fried_chicken/source/gameengine/Expressions/Value.cpp
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
branches/soc-2012-fried_chicken/source/gameengine/GameLogic/SConscript
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2012-fried_chicken/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/soc-2012-fried_chicken/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2012-fried_chicken/source/gameengine/SceneGraph/SG_Tree.h
branches/soc-2012-fried_chicken/source/tools/check_style_c.py
branches/soc-2012-fried_chicken/source/tools/uncrustify.cfg
Added Paths:
-----------
branches/soc-2012-fried_chicken/release/scripts/modules/bl_i18n_utils/
branches/soc-2012-fried_chicken/release/scripts/templates/operator_modal_view3d_raycast.py
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_ops.h
Removed Paths:
-------------
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertColourToValueProg.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_ConvertValueToColourProg.h
branches/soc-2012-fried_chicken/source/creator/SConscript
Property Changed:
----------------
branches/soc-2012-fried_chicken/
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-fried_chicken
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46807-48317
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46807-48602
Modified: branches/soc-2012-fried_chicken/CMakeLists.txt
===================================================================
--- branches/soc-2012-fried_chicken/CMakeLists.txt 2012-07-04 17:00:20 UTC (rev 48603)
+++ branches/soc-2012-fried_chicken/CMakeLists.txt 2012-07-04 17:15:05 UTC (rev 48604)
@@ -123,13 +123,14 @@
mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
-option(WITH_PYTHON_MODULE "Enable building as a python module (experimental, only enable for development)" OFF)
+option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
# GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
@@ -462,11 +463,6 @@
if(UNIX AND NOT APPLE)
- # needed for ubuntu 11.04
- if(EXISTS "/usr/lib/x86_64-linux-gnu")
- set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
- endif()
-
# set lib directory if it exists
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
@@ -671,7 +667,6 @@
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
- set(WITH_CYCLES OFF)
message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
endif()
endif()
@@ -995,22 +990,19 @@
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC10)
- set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
+ set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
+ set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
else()
- set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ set(BOOST_LIBPATH ${BOOST}/lib)
+ set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
endif()
set(BOOST_LIBRARIES
optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
- if(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
- else()
- set(BOOST_LIBPATH ${BOOST}/lib)
- endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
@@ -1462,6 +1454,16 @@
endif()
endif()
+if(WITH_CYCLES)
+ if(NOT WITH_OPENIMAGEIO)
+ message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
+ endif()
+ if(NOT WITH_BOOST)
+ message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
+ endif()
+endif()
+
+
# See TEST_SSE_SUPPORT() for how this is defined.
if(WITH_RAYOPTIMIZATION)
Modified: branches/soc-2012-fried_chicken/GNUmakefile
===================================================================
--- branches/soc-2012-fried_chicken/GNUmakefile 2012-07-04 17:00:20 UTC (rev 48603)
+++ branches/soc-2012-fried_chicken/GNUmakefile 2012-07-04 17:15:05 UTC (rev 48604)
@@ -162,21 +162,21 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Testing Targets (not assosiated with building blender)"
+ @echo "Testing Targets (not associated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
@echo " * test_style - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
@echo ""
- @echo "Static Source Code Checking (not assosiated with building blender)"
+ @echo "Static Source Code Checking (not associated with building blender)"
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo " * check_spelling_c - check for spelling errors (C/C++ only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
- @echo "Documentation Targets (not assosiated with building blender)"
+ @echo "Documentation Targets (not associated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
@echo " * doc_doxy - generate doxygen C/C++ docs"
@echo " * doc_dna - generate blender file format reference"
Modified: branches/soc-2012-fried_chicken/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-fried_chicken/build_files/cmake/macros.cmake 2012-07-04 17:00:20 UTC (rev 48603)
+++ branches/soc-2012-fried_chicken/build_files/cmake/macros.cmake 2012-07-04 17:15:05 UTC (rev 48604)
@@ -236,8 +236,7 @@
${OPENGL_glu_LIBRARY}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY}
- ${LAPACK_LIBRARIES})
+ ${FREETYPE_LIBRARY})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
@@ -346,7 +345,9 @@
if(WITH_INPUT_NDOF)
target_link_libraries(${target} ${NDOF_LIBRARIES})
endif()
-
+ if(WITH_MOD_CLOTH_ELTOPO)
+ target_link_libraries(${target} ${LAPACK_LIBRARIES})
+ endif()
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
@@ -452,6 +453,12 @@
add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
endif()
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ remove_cc_flag("-Wunused-parameter")
+ remove_cc_flag("-Wunused-variable")
+ remove_cc_flag("-Werror")
+ endif()
+
if(MSVC)
# TODO
endif()
Modified: branches/soc-2012-fried_chicken/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2012-fried_chicken/build_files/scons/config/win32-vc-config.py 2012-07-04 17:00:20 UTC (rev 48603)
+++ branches/soc-2012-fried_chicken/build_files/scons/config/win32-vc-config.py 2012-07-04 17:15:05 UTC (rev 48604)
@@ -159,7 +159,7 @@
WITH_BF_BOOST = True
BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
Modified: branches/soc-2012-fried_chicken/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2012-fried_chicken/build_files/scons/config/win64-vc-config.py 2012-07-04 17:00:20 UTC (rev 48603)
+++ branches/soc-2012-fried_chicken/build_files/scons/config/win64-vc-config.py 2012-07-04 17:15:05 UTC (rev 48604)
@@ -156,7 +156,7 @@
WITH_BF_BOOST = True
BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47 libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47 libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list