[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34829] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 34828.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Mon Feb 14 00:47:43 CET 2011
Revision: 34829
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34829
Author: kjym3
Date: 2011-02-13 23:47:30 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34828.
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34828
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2008-mxcurioni/release/bin/blender-thumbnailer.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/console/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_calltip.py
branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_import.py
branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_namespace.py
branches/soc-2008-mxcurioni/release/scripts/modules/console/intellisense.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/op/fcurve_euler_filter.py
branches/soc-2008-mxcurioni/release/scripts/op/image.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
branches/soc-2008-mxcurioni/release/scripts/op/nla.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/object_align.py
branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/templates/addon_add_object.py
branches/soc-2008-mxcurioni/release/scripts/templates/builtin_keyingset.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_export.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_mesh_add.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_simple.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_uv.py
branches/soc-2008-mxcurioni/release/scripts/templates/panel_simple.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_animviz.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_logic.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_nla.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_outliner.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_dir.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_util.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bmfont.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image_gen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/property.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sketch.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/suggestions.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/world.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/graph.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_writefile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SkinInfo.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_types.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_report.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_thumbs.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/CMP_node.h
branches/soc-2008-mxcurioni/source/blender/nodes/SHD_node.h
branches/soc-2008-mxcurioni/source/blender/nodes/TEX_node.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_at.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.h
branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/generic/noise.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_window.h
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/package_spec/build_debian.sh
branches/soc-2008-mxcurioni/build_files/package_spec/debian/
branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog
branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat
branches/soc-2008-mxcurioni/build_files/package_spec/debian/control
branches/soc-2008-mxcurioni/build_files/package_spec/debian/copyright
branches/soc-2008-mxcurioni/build_files/package_spec/debian/docs
branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu
branches/soc-2008-mxcurioni/build_files/package_spec/debian/rules
branches/soc-2008-mxcurioni/build_files/package_spec/debian/source/
branches/soc-2008-mxcurioni/build_files/package_spec/debian/source/format
branches/soc-2008-mxcurioni/build_files/package_spec/debian/watch
branches/soc-2008-mxcurioni/release/scripts/modules/keyingsets_utils.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog
branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat
branches/soc-2008-mxcurioni/build_files/package_spec/debian/control
branches/soc-2008-mxcurioni/build_files/package_spec/debian/copyright
branches/soc-2008-mxcurioni/build_files/package_spec/debian/docs
branches/soc-2008-mxcurioni/build_files/package_spec/debian/menu
branches/soc-2008-mxcurioni/build_files/package_spec/debian/rules
branches/soc-2008-mxcurioni/build_files/package_spec/debian/source/
branches/soc-2008-mxcurioni/build_files/package_spec/debian/source/format
branches/soc-2008-mxcurioni/build_files/package_spec/debian/watch
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_utils.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/PKGBUILD
branches/soc-2008-mxcurioni/build_files/package_spec/pacman/blender.install
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-34670
+ /trunk/blender:34011-34828
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-02-13 19:47:57 UTC (rev 34828)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-02-13 23:47:30 UTC (rev 34829)
@@ -226,7 +226,7 @@
# No way to set py31. remove for now.
# find_package(PythonLibs)
set(PYTHON /usr)
- set(PYTHON_VERSION 3.1)
+ set(PYTHON_VERSION 3.1 CACHE STRING "")
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
mark_as_advanced(PYTHON_INCLUDE_DIRS)
# set(PYTHON_BINARY python) # not used yet
@@ -547,17 +547,24 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
- set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
if(MSVC80)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
+ set(MSVC_LIB _vs2005)
+ set(MSVC_INC)
+ elseif(MSVC90)
+ set(MSVC_LIB _vs2008)
+ set(MSVC_INC)
+ elseif(MSVC10)
+ set(MSVC_LIB _vs2010)
+ set(MSVC_INC _vs2010)
else()
- set(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
+ set(MSVC_LIB msvc)
+ set(MSVC_INC)
endif()
- if(MSVC90)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
- endif()
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+ set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+ set(OPENEXR_INC ${OPENEXR_INCUDE}/ ${OPENEXR_INCUDE}/IlmImf ${OPENEXR_INCUDE}/Iex ${OPENEXR_INCUDE}/Imath)
endif()
if(WITH_IMAGE_TIFF)
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2011-02-13 19:47:57 UTC (rev 34828)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2011-02-13 23:47:30 UTC (rev 34829)
@@ -28,12 +28,13 @@
# System Vars
OS:=$(shell uname -s)
-CPU:=$(shell uname -m)
+OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
+# CPU:=$(shell uname -m) # UNUSED
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
-BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS)_$(CPU)
+BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
# Get the number of cores for threaded build
@@ -60,7 +61,7 @@
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
mkdir -p $(BUILD_DIR) ; \
cd $(BUILD_DIR) ; \
- cmake $(BLENDER_DIR) ; \
+ cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=Release ; \
fi
@echo
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-02-13 19:47:57 UTC (rev 34828)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-02-13 23:47:30 UTC (rev 34829)
@@ -489,11 +489,13 @@
dn.remove('.svn')
if '_svn' in dn:
dn.remove('_svn')
-
+ if '__pycache__' in dn: # py3.2 cache dir
+ dn.remove('__pycache__')
+
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
-
- source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
+
+ source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
# To ensure empty dirs are created too
if len(source)==0:
env.Execute(Mkdir(dir))
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/build_debian.sh (from rev 34828, trunk/blender/build_files/package_spec/build_debian.sh)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/build_debian.sh (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/build_debian.sh 2011-02-13 23:47:30 UTC (rev 34829)
@@ -0,0 +1,35 @@
+#!/bin/sh
+# Builds a debian package from SVN source.
+#
+# For paralelle builds use:
+# DEB_BUILD_OPTIONS="parallel=5" sh build_files/package_spec/build_debian.sh
+
+# this needs to run in the root dir.
+cd $(dirname $0)/../../
+rm -rf debian
+cp -a build_files/package_spec/debian .
+
+
+# Get values from blender to use in debian/changelog.
+BLENDER_REVISION=$(svnversion)
+
+blender_srcdir=$PWD
+blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+BLENDER_VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100).${blender_subversion}
+DEB_VERSION=${BLENDER_VERSION}+svn${BLENDER_REVISION}-bf
+
+# update debian/changelog
+dch -b -v $DEB_VERSION "New upstream SVN snapshot."
+
+
+# run the rules makefile
+debian/rules get-orig-source SVN_URL=.
+mv *.gz ../
+
+# build the package
+debuild -i -us -uc -b
+
+
+# remove temp dir
+rm -rf debian
Deleted: branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog
===================================================================
--- trunk/blender/build_files/package_spec/debian/changelog 2011-02-13 19:47:57 UTC (rev 34828)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog 2011-02-13 23:47:30 UTC (rev 34829)
@@ -1,5 +0,0 @@
-blender (2.56+svn34749-bf) unstable; urgency=low
-
- * New upstream SVN snapshot.
-
- -- Dan Eicher <dan at trollwerks.org> Wed, 09 Feb 2011 18:55:24 -0700
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog (from rev 34828, trunk/blender/build_files/package_spec/debian/changelog)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/changelog 2011-02-13 23:47:30 UTC (rev 34829)
@@ -0,0 +1,5 @@
+blender (2.56+svn34749-bf) unstable; urgency=low
+
+ * New upstream SVN snapshot.
+
+ -- Dan Eicher <dan at trollwerks.org> Wed, 09 Feb 2011 18:55:24 -0700
Deleted: branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat
===================================================================
--- trunk/blender/build_files/package_spec/debian/compat 2011-02-13 19:47:57 UTC (rev 34828)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat 2011-02-13 23:47:30 UTC (rev 34829)
@@ -1 +0,0 @@
-7
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat (from rev 34828, trunk/blender/build_files/package_spec/debian/compat)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/compat 2011-02-13 23:47:30 UTC (rev 34829)
@@ -0,0 +1 @@
+7
Deleted: branches/soc-2008-mxcurioni/build_files/package_spec/debian/control
===================================================================
--- trunk/blender/build_files/package_spec/debian/control 2011-02-13 19:47:57 UTC (rev 34828)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/control 2011-02-13 23:47:30 UTC (rev 34829)
@@ -1,23 +0,0 @@
-Source: blender
-Section: graphics
-Priority: extra
-Maintainer: Dan Eicher <dan at trollwerks.org>
-Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
-Standards-Version: 3.9.1
-Homepage: http://blender.org/
-Vcs-Browser: http://github.com/eponymous/blender
-Vcs-Git: git://github.com/eponymous/blender.git
-X-Python3-Version: >= 3.1, << 3.2
-
-Package: blender
-Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
-Description: Very fast and versatile 3D modeller/renderer
- Blender is an integrated 3d suite for modelling, animation, rendering,
- post-production, interactive creation and playback (games). Blender has its
- own particular user interface, which is implemented entirely in OpenGL and
- designed with speed in mind. Python bindings are available for scripting;
- import/export features for popular file formats like 3D Studio and Wavefront
- Obj are implemented as scripts by the community. Stills, animations, models
- for games or other third party engines and interactive content in the form of
- a standalone binary and/or a web plug-in are common products of Blender use.
Copied: branches/soc-2008-mxcurioni/build_files/package_spec/debian/control (from rev 34828, trunk/blender/build_files/package_spec/debian/control)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/package_spec/debian/control (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/package_spec/debian/control 2011-02-13 23:47:30 UTC (rev 34829)
@@ -0,0 +1,23 @@
+Source: blender
+Section: graphics
+Priority: extra
+Maintainer: Dan Eicher <dan at trollwerks.org>
+Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
+Standards-Version: 3.9.1
+Homepage: http://blender.org/
+Vcs-Browser: http://github.com/eponymous/blender
+Vcs-Git: git://github.com/eponymous/blender.git
+X-Python3-Version: >= 3.1, << 3.2
+
+Package: blender
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
+Description: Very fast and versatile 3D modeller/renderer
+ Blender is an integrated 3d suite for modelling, animation, rendering,
+ post-production, interactive creation and playback (games). Blender has its
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list