[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41536] branches/soc-2011-tomato: Merging r41246 through r41535 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Fri Nov 4 22:57:02 CET 2011
Revision: 41536
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41536
Author: nazgul
Date: 2011-11-04 21:57:01 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Merging r41246 through r41535 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41246
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41535
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-tomato/build_files/cmake/cmake_consistency_check_config.py
branches/soc-2011-tomato/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/cmake/project_info.py
branches/soc-2011-tomato/build_files/cmake/project_source_info.py
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/intern/SConscript
branches/soc-2011-tomato/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/SConscript
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-tomato/intern/itasc/CMakeLists.txt
branches/soc-2011-tomato/intern/moto/CMakeLists.txt
branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/modules/bpy/__init__.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/image.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/SConscript
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/screen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/world.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_bpath.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_string.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_threads.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.h
branches/soc-2011-tomato/source/blender/editors/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/SConscript
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-tomato/source/blender/editors/animation/keyingsets.c
branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
branches/soc-2011-tomato/source/blender/editors/armature/poseUtils.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
branches/soc-2011-tomato/source/blender/editors/curve/editfont.c
branches/soc-2011-tomato/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/ED_datafiles.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
branches/soc-2011-tomato/source/blender/editors/include/ED_render.h
branches/soc-2011-tomato/source/blender/editors/include/ED_screen.h
branches/soc-2011-tomato/source/blender/editors/include/ED_space_api.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/render/render_update.c
branches/soc-2011-tomato/source/blender/editors/render/render_view.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/sound/sound_ops.c
branches/soc-2011-tomato/source/blender/editors/space_action/action_edit.c
branches/soc-2011-tomato/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_intern.h
branches/soc-2011-tomato/source/blender/editors/space_image/image_intern.h
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-tomato/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_script/script_intern.h
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_header.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/editors/space_time/time_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/module.c
branches/soc-2011-tomato/source/blender/imbuf/intern/readimage.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_context.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_key.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-tomato/source/blender/modifiers/SConscript
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/python/BPY_extern.h
branches/soc-2011-tomato/source/blender/python/generic/IDProp.c
branches/soc-2011-tomato/source/blender/python/generic/IDProp.h
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-tomato/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_operator.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_props.c
branches/soc-2011-tomato/source/blender/python/intern/gpu.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-tomato/source/blender/python/simple_enum_gen.py
branches/soc-2011-tomato/source/blender/quicktime/SConscript
branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2011-tomato/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-tomato/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.h
branches/soc-2011-tomato/source/gameengine/Expressions/ListValue.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/StringValue.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonSeq.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/BlendType.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/FilterBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/Texture.h
branches/soc-2011-tomato/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/soc-2011-tomato/source/tests/check_deprecated.py
Added Paths:
-----------
branches/soc-2011-tomato/doc/python_api/examples/bpy.app.handlers.1.py
branches/soc-2011-tomato/doc/python_api/examples/bpy.app.handlers.py
branches/soc-2011-tomato/release/bin/blender-softwaregl
branches/soc-2011-tomato/release/datafiles/blender_icons.png
branches/soc-2011-tomato/source/blender/editors/datafiles/blender_icons.png.c
Removed Paths:
-------------
branches/soc-2011-tomato/release/datafiles/blenderbuttons
branches/soc-2011-tomato/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2011-tomato/source/blender/editors/space_script/script_header.c
branches/soc-2011-tomato/source/blender/editors/space_sound/
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41245
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41535
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-11-04 21:29:28 UTC (rev 41535)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-11-04 21:57:01 UTC (rev 41536)
@@ -61,6 +61,13 @@
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# global compile definitions since add_definitions() adds for all.
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG _DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE NDEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL NDEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
+
+
#-----------------------------------------------------------------------------
# Set policy
@@ -148,8 +155,10 @@
endif()
if(UNIX AND NOT APPLE)
- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON)
+ option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+ option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
+ mark_as_advanced(WITH_XDG_USER_DIRS)
else()
# not an option for other OS's
set(WITH_BUILTIN_GLEW ON)
@@ -298,6 +307,9 @@
set(C_WARNINGS)
set(CXX_WARNINGS)
+# for gcc -Wno-blah-blah
+set(CC_REMOVE_STRICT_FLAGS)
+
# libraries to link the binary with passed to target_link_libraries()
# known as LLIBS to scons
set(PLATFORM_LINKLIBS "")
@@ -506,8 +518,8 @@
set(PLATFORM_LINKFLAGS "-pthread")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
+ # lfs on glibc, all compilers should use
+ add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
# GNU Compiler
if(CMAKE_COMPILER_IS_GNUCC)
@@ -615,21 +627,21 @@
set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
@@ -787,9 +799,6 @@
add_definitions(-DFREE_WINDOWS)
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
-
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gcc/gettext)
set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
@@ -1220,21 +1229,6 @@
#-----------------------------------------------------------------------------
# Extra compile flags
-if((NOT WIN32) AND (NOT MSVC))
- # used for internal debug checks
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
-
- # assert() checks for this.
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")
-
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
-endif()
-
if(CMAKE_COMPILER_IS_GNUCC)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -1264,6 +1258,11 @@
# # this causes too many warnings, disable
# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+ # flags to undo strict flags
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile 2011-11-04 21:29:28 UTC (rev 41535)
+++ branches/soc-2011-tomato/GNUmakefile 2011-11-04 21:57:01 UTC (rev 41536)
@@ -1,6 +1,5 @@
# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-# $Id: GNUmakefile 41122 2011-10-19 21:55:27Z campbellbarton $
+# vim: tabstop=4
#
# ##### BEGIN GPL LICENSE BLOCK #####
#
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2011-11-04 21:29:28 UTC (rev 41535)
+++ branches/soc-2011-tomato/SConstruct 2011-11-04 21:57:01 UTC (rev 41536)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# $Id: SConstruct 41169 2011-10-21 04:23:26Z campbellbarton $
+#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -30,6 +30,8 @@
# Then read all SConscripts and build
#
# TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
+# TODO: directory copy functions are far too complicated, see:
+# http://wiki.blender.org/index.php/User:Ideasman42/SConsNotSimpleInstallingFiles
import platform as pltfrm
@@ -251,7 +253,9 @@
target_env_defs['WITH_BF_BULLET'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_FLUID'] = False
+ target_env_defs['WITH_BF_DECIMATE'] = False
+ target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
@@ -321,9 +325,9 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
-# disable elbeem (fluidsim) compilation?
-if env['BF_NO_ELBEEM'] == 1:
- env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+# build without elbeem (fluidsim)?
+if env['WITH_BF_FLUID'] == 1:
+ env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
if btools.ENDIAN == "big":
Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-04 21:29:28 UTC (rev 41535)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-04 21:57:01 UTC (rev 41536)
@@ -44,8 +44,19 @@
MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
+# if the user passes these defines as args, we dont want to overwrite
+SET(_IS_INC_DEF OFF)
+SET(_IS_LIB_DEF OFF)
+IF(DEFINED PYTHON_INCLUDE_DIR)
+ SET(_IS_INC_DEF ON)
+ENDIF()
+IF(DEFINED PYTHON_LIBRARY)
+ SET(_IS_LIB_DEF ON)
+ENDIF()
+
+
# only search for the dirs if we havn't already
-IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY))
+IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
SET(_python_ABI_FLAGS
"m;mu;u; " # release
@@ -66,30 +77,38 @@
#ENDIF()
STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
- FIND_PATH(PYTHON_INCLUDE_DIR
- NAMES
- Python.h
- HINTS
- ${_python_SEARCH_DIRS}
- PATH_SUFFIXES
- include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
- )
+ IF(NOT DEFINED PYTHON_INCLUDE_DIR)
+ FIND_PATH(PYTHON_INCLUDE_DIR
+ NAMES
+ Python.h
+ HINTS
+ ${_python_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
+ )
+ ENDIF()
- FIND_LIBRARY(PYTHON_LIBRARY
- NAMES
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list