[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49614] branches/soc-2012-bratwurst: merge troonk revusion 49612
Antony Riakiotakis
kalast at gmail.com
Mon Aug 6 15:14:04 CEST 2012
Revision: 49614
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49614
Author: psy-fi
Date: 2012-08-06 13:14:03 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
merge troonk revusion 49612
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/build_files/buildbot/slave_pack.py
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/tools/btools.py
branches/soc-2012-bratwurst/extern/CMakeLists.txt
branches/soc-2012-bratwurst/extern/SConscript
branches/soc-2012-bratwurst/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2012-bratwurst/extern/libmv/libmv/simple_pipeline/detect.cc
branches/soc-2012-bratwurst/intern/CMakeLists.txt
branches/soc-2012-bratwurst/intern/SConscript
branches/soc-2012-bratwurst/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/soc-2012-bratwurst/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/soc-2012-bratwurst/intern/audaspace/FX/AUD_FaderFactory.h
branches/soc-2012-bratwurst/intern/audaspace/intern/AUD_3DMath.h
branches/soc-2012-bratwurst/intern/audaspace/intern/AUD_C-API.h
branches/soc-2012-bratwurst/intern/bsp/CMakeLists.txt
branches/soc-2012-bratwurst/intern/bsp/SConscript
branches/soc-2012-bratwurst/intern/bsp/intern/CSG_BooleanOps.cpp
branches/soc-2012-bratwurst/intern/cycles/bvh/bvh.cpp
branches/soc-2012-bratwurst/intern/cycles/device/device_opencl.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_path.h
branches/soc-2012-bratwurst/intern/cycles/render/image.cpp
branches/soc-2012-bratwurst/intern/cycles/render/light.cpp
branches/soc-2012-bratwurst/intern/cycles/render/object.cpp
branches/soc-2012-bratwurst/intern/ghost/GHOST_IWindow.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2012-bratwurst/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2012-bratwurst/intern/guardedalloc/intern/mallocn.c
branches/soc-2012-bratwurst/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2012-bratwurst/intern/string/STR_HashedString.h
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/blurry_footage.py
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/default.py
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/fast_motion.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/clip.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/presets.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-bratwurst/source/blender/avi/intern/avi.c
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cloth.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_customdata.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_font.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mesh.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_tracking.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/bmfont.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/customdata.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/displist.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/font.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.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/mask_rasterize.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/material.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/packedFile.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/blenkernel/intern/writeavi.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_memarena.h
branches/soc-2012-bratwurst/source/blender/blenlib/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/blenlib/intern/bpath.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/freetypefont.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_geom.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_rotation.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/string_utf8.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.h
branches/soc-2012-bratwurst/source/blender/blenloader/intern/undofile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2012-bratwurst/source/blender/bmesh/operators/bmo_create.c
branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/AnimationExporter.h
branches/soc-2012-bratwurst/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/AnimationImporter.h
branches/soc-2012-bratwurst/source/blender/collada/CameraExporter.cpp
branches/soc-2012-bratwurst/source/blender/collada/DocumentImporter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/COM_compositor.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_MemoryBuffer.h
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_WorkScheduler.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
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_ChannelMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
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_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DifferenceMatteOperation.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_DirectionalBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.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_LuminanceMatteOperation.cpp
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_MathBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
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_TrackPositionOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerOperation.cpp
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/anim_draw.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editcurve.c
branches/soc-2012-bratwurst/source/blender/editors/curve/editfont.c
branches/soc-2012-bratwurst/source/blender/editors/include/BIF_gl.h
branches/soc-2012-bratwurst/source/blender/editors/include/BIF_glutil.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_image.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_mask.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/interface/interface_draw.c
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/view2d.c
branches/soc-2012-bratwurst/source/blender/editors/io/io_collada.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_add.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_draw.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_ops.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_add.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_modifier.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_relations.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_select.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_internal.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_preview.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_shading.c
branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
branches/soc-2012-bratwurst/source/blender/editors/screen/glutil.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_edit.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_ops.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screendump.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2012-bratwurst/source/blender/editors/sound/sound_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_buttons/buttons_ops.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_graph/graph_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/space_graph.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/space_image.c
branches/soc-2012-bratwurst/source/blender/editors/space_info/info_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/CMakeLists.txt
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_draw.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_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_templates.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/space_node.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_add.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_text/text_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_text/text_ops.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.h
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_constraints.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/transform/transform_snap.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_draw.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/jpeg.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/scaling.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_ID.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_material_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_texture_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_ID.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2012-bratwurst/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_interface.c
branches/soc-2012-bratwurst/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2012-bratwurst/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2012-bratwurst/source/blender/render/intern/include/texture.h
branches/soc-2012-bratwurst/source/blender/render/intern/include/zbuf.h
branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/bvh.h
branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2012-bratwurst/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/soc-2012-bratwurst/source/blender/render/intern/source/convertblender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/envmap.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/imagetexture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/pipeline.c
branches/soc-2012-bratwurst/source/blender/windowmanager/WM_api.h
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_files.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_subwindow.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/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2012-bratwurst/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2012-bratwurst/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2012-bratwurst/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2012-bratwurst/source/gameengine/VideoTexture/ImageRender.cpp
Added Paths:
-----------
branches/soc-2012-bratwurst/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2012-bratwurst/intern/bsp/intern/BOP_Interface.h
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/planar.py
branches/soc-2012-bratwurst/release/scripts/templates/ui_panel.py
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_stack.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/stack.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_add.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_group.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_view.c
Removed Paths:
-------------
branches/soc-2012-bratwurst/intern/boolop/CMakeLists.txt
branches/soc-2012-bratwurst/intern/boolop/SConscript
branches/soc-2012-bratwurst/intern/boolop/extern/BOP_Interface.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_BBox.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_BBox.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_BSPNode.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_BSPNode.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_BSPTree.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_BSPTree.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_CarveInterface.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Chrono.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Edge.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Edge.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Face.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Face.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Face2Face.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Indexs.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_MathUtils.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_MathUtils.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Merge.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Merge.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Merge2.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Merge2.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Mesh.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Misc.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Segment.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Segment.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Splitter.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Splitter.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Tag.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Tag.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Triangulator.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Triangulator.h
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Vertex.cpp
branches/soc-2012-bratwurst/intern/boolop/intern/BOP_Vertex.h
branches/soc-2012-bratwurst/intern/bsp/test/
branches/soc-2012-bratwurst/release/scripts/presets/tracking_settings/blurry_movie.py
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_state.c
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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294
/trunk/blender:46808-49411
+ /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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46808-49612
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2012-08-06 13:04:40 UTC (rev 49613)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2012-08-06 13:14:03 UTC (rev 49614)
@@ -228,9 +228,6 @@
# Camera/motion tracking
option(WITH_LIBMV "Enable libmv structure from motion library" ON)
-# Mesh boolean lib
-option(WITH_CARVE "Enable Carve library to handle mesh boolean operations" ON)
-
# Misc
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
@@ -370,8 +367,8 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles and carve
-if(WITH_CYCLES OR WITH_CARVE)
+# auto enable boost for cycles and booleans
+if(WITH_CYCLES OR WITH_MOD_BOOLEAN)
set(WITH_BOOST ON)
endif()
@@ -862,7 +859,7 @@
if(WITH_MOD_CLOTH_ELTOPO)
set(LAPACK ${LIBDIR}/lapack)
# set(LAPACK_INCLUDE_DIR ${LAPACK}/include)
- set_lib_path(LAPACK_LIBPATH ${LAPACK}/lib)
+ set(LAPACK_LIBPATH ${LAPACK}/lib)
set(LAPACK_LIBRARIES
${LIBDIR}/lapack/lib/libf2c.lib
${LIBDIR}/lapack/lib/clapack_nowrap.lib
@@ -902,6 +899,7 @@
endif()
if(WITH_OPENCOLLADA)
+ set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS
${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
@@ -910,23 +908,22 @@
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
${LIBDIR}/opencollada/include/GeneratedSaxParser/include
)
-
- set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
+ set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
- ${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
- ${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
- ${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
- ${OPENCOLLADA_LIBPATH}/xml2.lib
- ${OPENCOLLADA_LIBPATH}/buffer.lib
- ${OPENCOLLADA_LIBPATH}/ftoa.lib
- ${OPENCOLLADA_LIBPATH}/UTF.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib
+ ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib
+ ${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib
+ ${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib
+ ${OPENCOLLADA_LIBPATH}/lib/xml2.lib
+ ${OPENCOLLADA_LIBPATH}/lib/buffer.lib
+ ${OPENCOLLADA_LIBPATH}/lib/ftoa.lib
+ ${OPENCOLLADA_LIBPATH}/lib/UTF.lib
)
set(PCRE_LIBRARIES
- ${OPENCOLLADA_LIBPATH}/pcre.lib
+ ${OPENCOLLADA_LIBPATH}/lib/pcre.lib
)
unset(OPENCOLLADA_LIBPATH)
@@ -950,7 +947,8 @@
if(WITH_IMAGE_OPENEXR)
set_lib_path(OPENEXR "openexr")
- set_lib_path(OPENEXR_LIBPATH "openexr/lib")
+ set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib
${OPENEXR_LIBPATH}/Half.lib
@@ -958,15 +956,12 @@
${OPENEXR_LIBPATH}/Imath.lib
${OPENEXR_LIBPATH}/IlmThread.lib
)
- set_lib_path(OPENEXR_INCUDE "openexr/include")
set(OPENEXR_INCLUDE_DIRS
- ${OPENEXR_INCUDE}
- ${OPENEXR_INCUDE}/IlmImf
- ${OPENEXR_INCUDE}/Iex
- ${OPENEXR_INCUDE}/Imath
+ ${OPENEXR_INCLUDE_DIR}
+ ${OPENEXR_INCLUDE_DIR}/IlmImf
+ ${OPENEXR_INCLUDE_DIR}/Iex
+ ${OPENEXR_INCLUDE_DIR}/Imath
)
- unset(OPENEXR_INCUDE)
- unset(OPENEXR_LIBPATH)
endif()
if(WITH_IMAGE_TIFF)
@@ -985,8 +980,9 @@
if(WITH_PYTHON)
# normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING)
- set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
- set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
+ set_lib_path(PYTHON "python")
+ set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION})
+ set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
@@ -1017,7 +1013,7 @@
set(OPENIMAGEIO ${LIBDIR}/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
- set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
+ set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS)
endif()
@@ -1658,9 +1654,6 @@
# MSVC2010 fails to links C++ libs right
if(MSVC10)
- if(WITH_IMAGE_OPENEXR)
- message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
- endif()
if(WITH_OPENCOLLADA)
message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
endif()
Modified: branches/soc-2012-bratwurst/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/buildbot/slave_pack.py 2012-08-06 13:04:40 UTC (rev 49613)
+++ branches/soc-2012-bratwurst/build_files/buildbot/slave_pack.py 2012-08-06 13:14:03 UTC (rev 49614)
@@ -55,11 +55,14 @@
'WITHOUT_BF_INSTALL=True']
config = None
+ bits = None
if builder.endswith('linux_x86_64_scons'):
config = 'user-config-x86_64.py'
+ bits = 64
elif builder.endswith('linux_i386_scons'):
- config = 'user-config-x86_64.py'
+ config = 'user-config-i686.py'
+ bits = 32
if config is not None:
config_fpath = os.path.join(config_dir, config)
@@ -69,7 +72,16 @@
blenderplayer = os.path.join(install_dir, 'blenderplayer')
subprocess.call(['strip', '--strip-all', blender, blenderplayer])
+ extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
+ mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
+ software_gl = os.path.join(extra, 'blender-softwaregl')
+
+ os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
+ os.system('cp %s %s' % (software_gl, install_dir))
+ os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
+
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+
sys.exit(retcode)
else:
if builder.find('win') != -1:
Modified: branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake 2012-08-06 13:04:40 UTC (rev 49613)
+++ branches/soc-2012-bratwurst/build_files/cmake/config/blender_lite.cmake 2012-08-06 13:14:03 UTC (rev 49614)
@@ -15,7 +15,6 @@
set(WITH_CYCLES OFF CACHE FORCE BOOL)
set(WITH_FFTW3 OFF CACHE FORCE BOOL)
set(WITH_LIBMV OFF CACHE FORCE BOOL)
-set(WITH_CARVE OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_COMPOSITOR OFF CACHE FORCE BOOL)
set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
Modified: branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/macros.cmake 2012-08-06 13:04:40 UTC (rev 49613)
+++ branches/soc-2012-bratwurst/build_files/cmake/macros.cmake 2012-08-06 13:14:03 UTC (rev 49614)
@@ -719,12 +719,9 @@
lvar
lproj)
-
- if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj})
- set(${lvar} ${LIBDIR}/vc2010/${lproj})
+ if(MSVC10)
+ set(${lvar} ${LIBDIR}/${lproj}/vc2010)
else()
set(${lvar} ${LIBDIR}/${lproj})
endif()
-
-
endmacro()
Modified: branches/soc-2012-bratwurst/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/tools/btools.py 2012-08-06 13:04:40 UTC (rev 49613)
+++ branches/soc-2012-bratwurst/build_files/scons/tools/btools.py 2012-08-06 13:14:03 UTC (rev 49614)
@@ -166,7 +166,7 @@
'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES', 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
- 'WITH_BF_LIBMV', 'WITH_BF_CARVE'
+ 'WITH_BF_LIBMV'
]
# Have options here that scons expects to be lists
@@ -535,7 +535,6 @@
(BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list