[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41584] branches/soc-2011-onion-uv-tools: Merge with trunk 41579
Antony Riakiotakis
kalast at gmail.com
Sun Nov 6 14:10:45 CET 2011
Revision: 41584
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41584
Author: psy-fi
Date: 2011-11-06 13:10:45 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Merge with trunk 41579
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/CMakeLists.txt
branches/soc-2011-onion-uv-tools/GNUmakefile
branches/soc-2011-onion-uv-tools/SConstruct
branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_consistency_check_config.py
branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-onion-uv-tools/build_files/cmake/macros.cmake
branches/soc-2011-onion-uv-tools/build_files/cmake/project_info.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py
branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
branches/soc-2011-onion-uv-tools/doc/doxygen/Doxyfile
branches/soc-2011-onion-uv-tools/doc/doxygen/doxygen.source
branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-onion-uv-tools/intern/SConscript
branches/soc-2011-onion-uv-tools/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-onion-uv-tools/intern/ghost/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_Buttons.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManager.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_EventWheel.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/__init__.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/image.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_context.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_deform.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_global.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_lattice.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_library.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_object.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_property.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_scene.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_screen.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_text.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/SConscript
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/action.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/blender.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/curve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/deform.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/effect.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/group.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/key.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/library.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mball.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/property.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/screen.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/texture.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/unit.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/world.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_bpath.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_string.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_threads.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/bpath.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/string.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/threads.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/uvproject.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
branches/soc-2011-onion-uv-tools/source/blender/collada/CameraExporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/editors/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/SConscript
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_markers.c
branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyframing.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/armature_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseUtils.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_armature.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_fluidsim.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_logic.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_node.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_particle.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_render.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_screen.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_space_api.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_transform.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_view3d.h
branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_interface.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editface.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_bake.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_relations.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/particle_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_preview.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_update.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_view.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/area.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filelist.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filelist.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_nla/nla_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_header.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/space_node.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/editors/space_script/script_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_time/time_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/util/editmode_undo.c
branches/soc-2011-onion-uv-tools/source/blender/editors/util/undo.c
branches/soc-2011-onion-uv-tools/source/blender/editors/util/util_intern.h
branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_buffers.h
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/moviecache.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_ID.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_camera.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_controller.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/modifiers/SConscript
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_common.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-onion-uv-tools/source/blender/python/BPY_extern.h
branches/soc-2011-onion-uv-tools/source/blender/python/generic/IDProp.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/IDProp.h
branches/soc-2011-onion-uv-tools/source/blender/python/generic/bgl.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/bgl.h
branches/soc-2011-onion-uv-tools/source/blender/python/generic/blf_py_api.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/noise_py_api.c
branches/soc-2011-onion-uv-tools/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_library.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_operator.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_props.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_traceback.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_util.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/gpu.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils.h
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_geometry.h
branches/soc-2011-onion-uv-tools/source/blender/python/simple_enum_gen.py
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/render_types.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/texture.h
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/envmap.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/external_engine.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/initrender.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-onion-uv-tools/source/creator/creator.c
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureConstraint.h
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Expression.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/ListValue.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/ListValue.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/StringValue.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Value.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Value.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ANDController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_AlwaysSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ExpressionController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_IController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_NANDController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_NORController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ORController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PropertyActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PropertySensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_RandomActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_RandomSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_XNORController.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_XORController.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ArmatureSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ConstraintWrapper.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Light.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonSeq.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_RadarSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SceneActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SoundActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_StateActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_VehicleWrapper.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_VertexProxy.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/BlendType.h
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/FilterBase.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/ImageBase.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.app.handlers.1.py
branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.app.handlers.py
branches/soc-2011-onion-uv-tools/release/scripts/presets/camera/
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_lamp.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/camera.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/lamp.c
Removed Paths:
-------------
branches/soc-2011-onion-uv-tools/po/
branches/soc-2011-onion-uv-tools/release/datafiles/locale/
branches/soc-2011-onion-uv-tools/source/blender/editors/space_script/script_header.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_sound/
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/release/datafiles/
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39665-41353
+ /trunk/blender:39665-41579
Added: svn:externals
+
Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt 2011-11-06 13:05:16 UTC (rev 41583)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt 2011-11-06 13:10:45 UTC (rev 41584)
@@ -65,7 +65,7 @@
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 DEBUG _DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
#-----------------------------------------------------------------------------
@@ -157,6 +157,8 @@
if(UNIX AND NOT APPLE)
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)
@@ -302,6 +304,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 "")
@@ -1250,6 +1255,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-onion-uv-tools/GNUmakefile
===================================================================
--- branches/soc-2011-onion-uv-tools/GNUmakefile 2011-11-06 13:05:16 UTC (rev 41583)
+++ branches/soc-2011-onion-uv-tools/GNUmakefile 2011-11-06 13:10:45 UTC (rev 41584)
@@ -135,9 +135,6 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Other Targets (not assosiated with building blender)"
- @echo " * translations - update blenders translation files in po/"
- @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -151,6 +148,7 @@
@echo ""
@echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
+ @echo " * doc_doxy - generate doxygen C/C++ docs"
@echo " * doc_dna - generate blender file format reference"
@echo " * doc_man - generate manpage"
@echo ""
@@ -170,16 +168,6 @@
# -----------------------------------------------------------------------------
-# Other Targets
-#
-translations:
- $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/update_msg.py
- python3 po/update_pot.py
- python3 po/update_po.py
- python3 po/update_mo.py
-
-
-# -----------------------------------------------------------------------------
# Tests
#
test:
@@ -238,9 +226,13 @@
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py:
$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py
- cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
+ cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
+doc_doxy:
+ cd doc/doxygen; doxygen
+ @echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
+
doc_dna:
$(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
Modified: branches/soc-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct 2011-11-06 13:05:16 UTC (rev 41583)
+++ branches/soc-2011-onion-uv-tools/SConstruct 2011-11-06 13:10:45 UTC (rev 41584)
@@ -253,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
@@ -323,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-onion-uv-tools/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-06 13:05:16 UTC (rev 41583)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-06 13:10:45 UTC (rev 41584)
@@ -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
- "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
- HINTS
- ${_python_SEARCH_DIRS}
- PATH_SUFFIXES
- lib64 lib
- )
+ IF(NOT DEFINED PYTHON_LIBRARY)
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES
+ "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
+ HINTS
+ ${_python_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+ ENDIF()
IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
break()
ELSE()
# ensure we dont find values from 2 different ABI versions
- UNSET(PYTHON_INCLUDE_DIR CACHE)
- UNSET(PYTHON_LIBRARY CACHE)
+ IF(NOT _IS_INC_DEF)
+ UNSET(PYTHON_INCLUDE_DIR CACHE)
+ ENDIF()
+ IF(NOT _IS_LIB_DEF)
+ UNSET(PYTHON_LIBRARY CACHE)
+ ENDIF()
ENDIF()
ENDFOREACH()
@@ -100,6 +119,9 @@
UNSET(_python_SEARCH_DIRS)
ENDIF()
+UNSET(_IS_INC_DEF)
+UNSET(_IS_LIB_DEF)
+
# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
Modified: branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_consistency_check_config.py 2011-11-06 13:05:16 UTC (rev 41583)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_consistency_check_config.py 2011-11-06 13:10:45 UTC (rev 41584)
@@ -29,8 +29,8 @@
"source/blender/imbuf/intern/imbuf_cocoa.m",
"extern/recastnavigation/Recast/Source/RecastLog.cpp",
"extern/recastnavigation/Recast/Source/RecastTimer.cpp",
- "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
- "entern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+ "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
+ "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -44,7 +44,7 @@
"extern/eltopo/common/meshes/ObjLoader.hpp",
"extern/eltopo/common/meshes/TriangleIndex.hpp",
"extern/eltopo/common/meshes/meshloader.h",
- "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
+ "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
"extern/recastnavigation/Recast/Include/RecastLog.h",
"extern/recastnavigation/Recast/Include/RecastTimer.h",
"intern/audaspace/SRC/AUD_SRCResampleFactory.h",
Modified: branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py 2011-11-06 13:05:16 UTC (rev 41583)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_qtcreator_project.py 2011-11-06 13:10:45 UTC (rev 41584)
@@ -40,6 +40,7 @@
is_py,
cmake_advanced_info,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list