[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48273] branches/soc-2012-bratwurst: merge with trunk 48272
Antony Riakiotakis
kalast at gmail.com
Mon Jun 25 16:38:20 CEST 2012
Revision: 48273
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48273
Author: psy-fi
Date: 2012-06-25 14:38:19 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
merge with trunk 48272
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/SConstruct
branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake
branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py
branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py
branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py
branches/soc-2012-bratwurst/doc/python_api/examples/bpy.ops.2.py
branches/soc-2012-bratwurst/doc/python_api/examples/bpy.ops.3.py
branches/soc-2012-bratwurst/doc/python_api/examples/bpy.types.Mesh.py
branches/soc-2012-bratwurst/extern/CMakeLists.txt
branches/soc-2012-bratwurst/extern/libopenjpeg/CMakeLists.txt
branches/soc-2012-bratwurst/extern/libopenjpeg/cio.c
branches/soc-2012-bratwurst/extern/libopenjpeg/cio.h
branches/soc-2012-bratwurst/extern/libopenjpeg/dwt.c
branches/soc-2012-bratwurst/extern/libopenjpeg/event.c
branches/soc-2012-bratwurst/extern/libopenjpeg/event.h
branches/soc-2012-bratwurst/extern/libopenjpeg/image.c
branches/soc-2012-bratwurst/extern/libopenjpeg/image.h
branches/soc-2012-bratwurst/extern/libopenjpeg/j2k.c
branches/soc-2012-bratwurst/extern/libopenjpeg/j2k.h
branches/soc-2012-bratwurst/extern/libopenjpeg/j2k_lib.c
branches/soc-2012-bratwurst/extern/libopenjpeg/j2k_lib.h
branches/soc-2012-bratwurst/extern/libopenjpeg/jp2.c
branches/soc-2012-bratwurst/extern/libopenjpeg/jp2.h
branches/soc-2012-bratwurst/extern/libopenjpeg/mct.c
branches/soc-2012-bratwurst/extern/libopenjpeg/mqc.c
branches/soc-2012-bratwurst/extern/libopenjpeg/mqc.h
branches/soc-2012-bratwurst/extern/libopenjpeg/openjpeg.c
branches/soc-2012-bratwurst/extern/libopenjpeg/openjpeg.h
branches/soc-2012-bratwurst/extern/libopenjpeg/opj_includes.h
branches/soc-2012-bratwurst/extern/libopenjpeg/opj_malloc.h
branches/soc-2012-bratwurst/extern/libopenjpeg/pi.c
branches/soc-2012-bratwurst/extern/libopenjpeg/pi.h
branches/soc-2012-bratwurst/extern/libopenjpeg/t1.c
branches/soc-2012-bratwurst/extern/libopenjpeg/t1.h
branches/soc-2012-bratwurst/extern/libopenjpeg/t2.c
branches/soc-2012-bratwurst/extern/libopenjpeg/t2.h
branches/soc-2012-bratwurst/extern/libopenjpeg/tcd.c
branches/soc-2012-bratwurst/extern/libopenjpeg/tcd.h
branches/soc-2012-bratwurst/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/soc-2012-bratwurst/intern/bsp/test/BSP_GhostTest/main.cpp
branches/soc-2012-bratwurst/intern/container/CTR_UHeap.h
branches/soc-2012-bratwurst/intern/cycles/SConscript
branches/soc-2012-bratwurst/intern/cycles/app/cycles_xml.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/addon/properties.py
branches/soc-2012-bratwurst/intern/cycles/blender/addon/ui.py
branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_session.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_sync.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_util.h
branches/soc-2012-bratwurst/intern/cycles/cmake/external_libs.cmake
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_triangle.h
branches/soc-2012-bratwurst/intern/cycles/render/film.cpp
branches/soc-2012-bratwurst/intern/cycles/render/film.h
branches/soc-2012-bratwurst/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_IEvent.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_IEventConsumer.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_ISystem.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_ISystemPaths.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_ITimerTask.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_IWindow.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_Rect.h
branches/soc-2012-bratwurst/intern/ghost/GHOST_Types.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_CallbackEventConsumer.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_DisplayManager.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_EventManager.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_TimerManager.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowManager.h
branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-bratwurst/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2012-bratwurst/intern/raskter/raskter.c
branches/soc-2012-bratwurst/intern/string/STR_String.h
branches/soc-2012-bratwurst/release/datafiles/clkernelstoh.py
branches/soc-2012-bratwurst/release/scripts/modules/addon_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/animsys_refactor.py
branches/soc-2012-bratwurst/release/scripts/modules/blend_render_info.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy/__init__.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy/ops.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy/utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2012-bratwurst/release/scripts/modules/bpyml_ui.py
branches/soc-2012-bratwurst/release/scripts/modules/console_python.py
branches/soc-2012-bratwurst/release/scripts/modules/console_shell.py
branches/soc-2012-bratwurst/release/scripts/modules/graphviz_export.py
branches/soc-2012-bratwurst/release/scripts/modules/rna_info.py
branches/soc-2012-bratwurst/release/scripts/modules/rna_xml.py
branches/soc-2012-bratwurst/release/scripts/modules/sys_info.py
branches/soc-2012-bratwurst/release/scripts/presets/interface_theme/back_to_black.xml
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/anim.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/console.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/object.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/wm.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_info.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_image.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_movieclip.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_multires.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/armature.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/boids.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/collision.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/ipo.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/library.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/movieclip.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/multires.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/ocean.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/tracking.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_array.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_math_vector.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_path_util.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_vector.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/path_util.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/voxel.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2012-bratwurst/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2012-bratwurst/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ArmatureExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ArmatureImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/collada/EffectExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/EffectExporter.h
branches/soc-2012-bratwurst/source/blender/collada/ExportSettings.h
branches/soc-2012-bratwurst/source/blender/collada/GeometryExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ImageExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/ImageExporter.h
branches/soc-2012-bratwurst/source/blender/collada/InstanceWriter.cpp
branches/soc-2012-bratwurst/source/blender/collada/InstanceWriter.h
branches/soc-2012-bratwurst/source/blender/collada/MaterialExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/SConscript
branches/soc-2012-bratwurst/source/blender/collada/SceneExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/SkinInfo.cpp
branches/soc-2012-bratwurst/source/blender/collada/TransformReader.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada.h
branches/soc-2012-bratwurst/source/blender/collada/collada_internal.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada_utils.cpp
branches/soc-2012-bratwurst/source/blender/collada/collada_utils.h
branches/soc-2012-bratwurst/source/blender/compositor/COM_compositor.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Device.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryProxy.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Node.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_OpenCLDevice.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Socket.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketConnection.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkPackage.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_KeyingNode.h
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ScaleNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TextureNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DilateErodeOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_NormalizeOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_RotateOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2012-bratwurst/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editcurve.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_clip.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_node.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_object.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_sequencer.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_draw.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_intern.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_layout.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_utils.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_widgets.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_draw.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_edit.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_intern.h
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_shapekey.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/meshtools.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_edit.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_intern.h
branches/soc-2012-bratwurst/source/blender/editors/object/object_modifier.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_ops.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_edit.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-bratwurst/source/blender/editors/space_api/spacetypes.c
branches/soc-2012-bratwurst/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_utils.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_panels.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-bratwurst/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_header.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_templates.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
branches/soc-2012-bratwurst/source/blender/editors/util/undo.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/jp2.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_object_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/intern/makesdna.c
branches/soc-2012-bratwurst/source/blender/makesrna/RNA_enum_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_color.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_util.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2012-bratwurst/source/blender/python/generic/bpy_internal_import.c
branches/soc-2012-bratwurst/source/blender/python/generic/bpy_internal_import.h
branches/soc-2012-bratwurst/source/blender/python/intern/stubs.c
branches/soc-2012-bratwurst/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2012-bratwurst/source/blender/render/intern/source/pipeline.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_texture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/rendercore.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-bratwurst/source/blenderplayer/CMakeLists.txt
branches/soc-2012-bratwurst/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-bratwurst/source/creator/CMakeLists.txt
branches/soc-2012-bratwurst/source/creator/creator.c
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2012-bratwurst/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2012-bratwurst/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2012-bratwurst/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2012-bratwurst/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2012-bratwurst/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/BoolValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/ConstExpr.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/EmptyValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/ErrorValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/Expression.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/FloatValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/IdentifierExpr.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/IfExpr.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/InputParser.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/IntValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/KX_HashedPtr.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/Operator1Expr.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/Operator2Expr.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/StringValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/Value.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/VectorValue.h
branches/soc-2012-bratwurst/source/gameengine/Expressions/VoidValue.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_BasicEventManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_EventManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_JoystickManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_MouseManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
branches/soc-2012-bratwurst/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Action.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Material.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_CameraIpoSGController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_EmptyObject.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_IInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_IScalarInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ISystem.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_LightIpoSGController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_MotionState.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_OrientationInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_PositionInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_RayCast.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_RayEventManager.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ScalarInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_ScalingInterpolator.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_TimeLogger.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_WorldInfo.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_WorldIpoController.h
branches/soc-2012-bratwurst/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/soc-2012-bratwurst/source/gameengine/Network/NG_NetworkMessage.h
branches/soc-2012-bratwurst/source/gameengine/Network/NG_NetworkObject.h
branches/soc-2012-bratwurst/source/gameengine/Network/NG_NetworkScene.h
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2012-bratwurst/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_IController.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_IMotionState.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_IVehicle.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_Polygon.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_Rect.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_BBox.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_Controller.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_DList.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_IObject.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_Node.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_ParentRelation.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_QList.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_Spatial.h
branches/soc-2012-bratwurst/source/gameengine/SceneGraph/SG_Tree.h
branches/soc-2012-bratwurst/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2012-bratwurst/extern/libopenjpeg/cidx_manager.c
branches/soc-2012-bratwurst/extern/libopenjpeg/cidx_manager.h
branches/soc-2012-bratwurst/extern/libopenjpeg/indexbox_manager.h
branches/soc-2012-bratwurst/extern/libopenjpeg/opj_config.h
branches/soc-2012-bratwurst/extern/libopenjpeg/phix_manager.c
branches/soc-2012-bratwurst/extern/libopenjpeg/ppix_manager.c
branches/soc-2012-bratwurst/extern/libopenjpeg/thix_manager.c
branches/soc-2012-bratwurst/extern/libopenjpeg/tpix_manager.c
branches/soc-2012-bratwurst/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
branches/soc-2012-bratwurst/release/scripts/presets/operator/wm.collada_export/second_life_static.py
Removed Paths:
-------------
branches/soc-2012-bratwurst/release/scripts/presets/operator/wm.collada_export/second_life.py
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46808-48082
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:46808-48272
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2012-06-25 14:38:19 UTC (rev 48273)
@@ -159,7 +159,7 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+ option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON)
# freebsd doesn't seems to support XDND
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -167,9 +167,20 @@
endif()
else()
# not an option for other OS's
- set(WITH_BUILTIN_GLEW ON)
+ set(WITH_SYSTEM_GLEW OFF)
endif()
+
+# (unix defaults to System OpenJPEG On)
+if(UNIX AND NOT APPLE)
+ set(PLATFORM_DEFAULT ON)
+else()
+ set(PLATFORM_DEFAULT OFF)
+endif()
+option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" ${PLATFORM_DEFAULT})
+unset(PLATFORM_DEFAULT)
+
+
# Modifiers
option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
@@ -1487,10 +1498,11 @@
if(WITH_IMAGE_OPENJPEG)
- if(UNIX AND NOT APPLE)
+ if(WITH_SYSTEM_OPENJPEG)
# dealt with above
else()
set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
+ add_definitions(-DOPJ_STATIC)
endif()
endif()
@@ -1541,20 +1553,20 @@
#-----------------------------------------------------------------------------
# Configure GLEW
-if(WITH_BUILTIN_GLEW)
- # set(GLEW_LIBRARY "") # unused
- set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
-else()
+if(WITH_SYSTEM_GLEW)
find_package(GLEW)
if(NOT GLEW_FOUND)
- message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
+ message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW")
endif()
mark_as_advanced(
GLEW_LIBRARY
GLEW_INCLUDE_PATH
)
+else()
+ # set(GLEW_LIBRARY "") # unused
+ set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
endif()
#-----------------------------------------------------------------------------
@@ -1713,6 +1725,7 @@
# better not set includes here but this debugging option is off by default.
if(WITH_CXX_GUARDEDALLOC)
include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
+ add_definitions(-DWITH_CXX_GUARDEDALLOC)
endif()
if(WITH_ASSERT_ABORT)
@@ -1793,8 +1806,9 @@
info_cfg_option(WITH_INSTALL_PORTABLE)
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
- info_cfg_option(WITH_BUILTIN_GLEW)
info_cfg_option(WITH_MEM_JEMALLOC)
+ info_cfg_option(WITH_SYSTEM_GLEW)
+ info_cfg_option(WITH_SYSTEM_OPENJPEG)
info_cfg_text("Image Formats:")
info_cfg_option(WITH_IMAGE_CINEON)
Modified: branches/soc-2012-bratwurst/SConstruct
===================================================================
--- branches/soc-2012-bratwurst/SConstruct 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/SConstruct 2012-06-25 14:38:19 UTC (rev 48273)
@@ -240,6 +240,7 @@
if 'blenderlite' in B.targets:
target_env_defs = {}
target_env_defs['WITH_BF_GAMEENGINE'] = False
+ target_env_defs['WITH_BF_CYCLES'] = False
target_env_defs['WITH_BF_OPENAL'] = False
target_env_defs['WITH_BF_OPENEXR'] = False
target_env_defs['WITH_BF_OPENMP'] = False
Modified: branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake 2012-06-25 14:38:19 UTC (rev 48273)
@@ -6,9 +6,9 @@
#
set(WITH_INSTALL_PORTABLE ON CACHE FORCE BOOL)
+set(WITH_SYSTEM_GLEW ON CACHE FORCE BOOL)
set(WITH_BUILDINFO OFF CACHE FORCE BOOL)
-set(WITH_BUILTIN_GLEW OFF CACHE FORCE BOOL)
set(WITH_BULLET OFF CACHE FORCE BOOL)
set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
Modified: branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/macros.cmake 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/build_files/cmake/macros.cmake 2012-06-25 14:38:19 UTC (rev 48273)
@@ -193,7 +193,7 @@
if(WITH_OPENIMAGEIO)
link_directories(${OPENIMAGEIO_LIBPATH})
endif()
- if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+ if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
link_directories(${OPENJPEG_LIBPATH})
endif()
if(WITH_CODEC_QUICKTIME)
@@ -253,7 +253,7 @@
endif()
endif()
- if(NOT WITH_BUILTIN_GLEW)
+ if(WITH_SYSTEM_GLEW)
target_link_libraries(${target} ${GLEW_LIBRARY})
endif()
@@ -303,7 +303,7 @@
target_link_libraries(${target} ${OPENEXR_LIBRARIES})
endif()
endif()
- if(WITH_IMAGE_OPENJPEG AND UNIX AND NOT APPLE)
+ if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG)
target_link_libraries(${target} ${OPENJPEG_LIBRARIES})
endif()
if(WITH_CODEC_FFMPEG)
Modified: branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py 2012-06-25 14:38:19 UTC (rev 48273)
@@ -181,7 +181,7 @@
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
CXXFLAGS = []
-CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
+CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
REL_CCFLAGS = ['-DNDEBUG', '-O2']
Modified: branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py 2012-06-25 14:38:19 UTC (rev 48273)
@@ -188,7 +188,7 @@
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
REL_CCFLAGS = ['-O2', '-DNDEBUG']
Modified: branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py 2012-06-25 14:38:19 UTC (rev 48273)
@@ -179,7 +179,7 @@
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
CXXFLAGS = [ '-fpermissive' ]
-CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
+CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']
Modified: branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py 2012-06-25 14:38:19 UTC (rev 48273)
@@ -186,7 +186,7 @@
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
-CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
REL_CCFLAGS = ['-O2', '-DNDEBUG']
Modified: branches/soc-2012-bratwurst/doc/python_api/examples/bpy.ops.2.py
===================================================================
--- branches/soc-2012-bratwurst/doc/python_api/examples/bpy.ops.2.py 2012-06-25 13:32:04 UTC (rev 48272)
+++ branches/soc-2012-bratwurst/doc/python_api/examples/bpy.ops.2.py 2012-06-25 14:38:19 UTC (rev 48273)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list