[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32046] branches/soc-2010-leifandersen: Merge with trunk: svn merge -r 31790:32045 https://svn.blender.org/svnroot /bf-blender/trunk/blender/ .
Leif Andersen
leif.a.andersen at gmail.com
Wed Sep 22 03:58:24 CEST 2010
Revision: 32046
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32046
Author: leifandersen
Date: 2010-09-22 03:58:20 +0200 (Wed, 22 Sep 2010)
Log Message:
-----------
Merge with trunk: svn merge -r 31790:32045 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ .
In preporation of the major API changes made last week.
Modified Paths:
--------------
branches/soc-2010-leifandersen/CMakeLists.txt
branches/soc-2010-leifandersen/SConstruct
branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py
branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py
branches/soc-2010-leifandersen/build_files/scons/tools/btools.py
branches/soc-2010-leifandersen/doc/blender.1.py
branches/soc-2010-leifandersen/extern/binreloc/CMakeLists.txt
branches/soc-2010-leifandersen/extern/glew/CMakeLists.txt
branches/soc-2010-leifandersen/extern/libopenjpeg/CMakeLists.txt
branches/soc-2010-leifandersen/extern/lzo/CMakeLists.txt
branches/soc-2010-leifandersen/intern/CMakeLists.txt
branches/soc-2010-leifandersen/intern/audaspace/CMakeLists.txt
branches/soc-2010-leifandersen/intern/boolop/CMakeLists.txt
branches/soc-2010-leifandersen/intern/bsp/CMakeLists.txt
branches/soc-2010-leifandersen/intern/container/CMakeLists.txt
branches/soc-2010-leifandersen/intern/decimation/CMakeLists.txt
branches/soc-2010-leifandersen/intern/elbeem/CMakeLists.txt
branches/soc-2010-leifandersen/intern/ghost/CMakeLists.txt
branches/soc-2010-leifandersen/intern/ghost/GHOST_Types.h
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_Debug.h
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-leifandersen/intern/guardedalloc/CMakeLists.txt
branches/soc-2010-leifandersen/intern/iksolver/CMakeLists.txt
branches/soc-2010-leifandersen/intern/itasc/CMakeLists.txt
branches/soc-2010-leifandersen/intern/memutil/CMakeLists.txt
branches/soc-2010-leifandersen/intern/moto/CMakeLists.txt
branches/soc-2010-leifandersen/intern/opennl/CMakeLists.txt
branches/soc-2010-leifandersen/intern/smoke/CMakeLists.txt
branches/soc-2010-leifandersen/intern/string/CMakeLists.txt
branches/soc-2010-leifandersen/intern/tools/pydna.py
branches/soc-2010-leifandersen/release/VERSION
branches/soc-2010-leifandersen/release/bin/blender-thumbnailer.py
branches/soc-2010-leifandersen/release/datafiles/splash.png
branches/soc-2010-leifandersen/release/getversion.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/__init__.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/client.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/master.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/operators.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/slave.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/ui.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/utils.py
branches/soc-2010-leifandersen/release/scripts/modules/add_object_utils.py
branches/soc-2010-leifandersen/release/scripts/modules/blend_render_info.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/__init__.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/ops.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/path.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/utils.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy_types.py
branches/soc-2010-leifandersen/release/scripts/modules/bpyml.py
branches/soc-2010-leifandersen/release/scripts/modules/bpyml_ui.py
branches/soc-2010-leifandersen/release/scripts/modules/graphviz_export.py
branches/soc-2010-leifandersen/release/scripts/modules/io_utils.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/eye_balls.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/mouth.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/shape_key_control.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/shape_key_distance.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-leifandersen/release/scripts/modules/rna_info.py
branches/soc-2010-leifandersen/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-leifandersen/release/scripts/op/add_armature_human.py
branches/soc-2010-leifandersen/release/scripts/op/add_mesh_torus.py
branches/soc-2010-leifandersen/release/scripts/op/console_python.py
branches/soc-2010-leifandersen/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-leifandersen/release/scripts/op/image.py
branches/soc-2010-leifandersen/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2010-leifandersen/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2010-leifandersen/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2010-leifandersen/release/scripts/op/io_mesh_ply/export_ply.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_3ds/export_3ds.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_fbx/export_fbx.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2010-leifandersen/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2010-leifandersen/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2010-leifandersen/release/scripts/op/mesh.py
branches/soc-2010-leifandersen/release/scripts/op/nla.py
branches/soc-2010-leifandersen/release/scripts/op/object.py
branches/soc-2010-leifandersen/release/scripts/op/object_align.py
branches/soc-2010-leifandersen/release/scripts/op/object_randomize_transform.py
branches/soc-2010-leifandersen/release/scripts/op/presets.py
branches/soc-2010-leifandersen/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2010-leifandersen/release/scripts/op/sequencer.py
branches/soc-2010-leifandersen/release/scripts/op/uv.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-leifandersen/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-leifandersen/release/scripts/op/wm.py
branches/soc-2010-leifandersen/release/scripts/templates/operator.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_modal.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_animviz.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_bone.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_curve.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_empty.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_game.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_material.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_particle.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_common.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_field.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_render.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_scene.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_texture.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_world.py
branches/soc-2010-leifandersen/release/scripts/ui/space_console.py
branches/soc-2010-leifandersen/release/scripts/ui/space_dopesheet.py
branches/soc-2010-leifandersen/release/scripts/ui/space_filebrowser.py
branches/soc-2010-leifandersen/release/scripts/ui/space_graph.py
branches/soc-2010-leifandersen/release/scripts/ui/space_image.py
branches/soc-2010-leifandersen/release/scripts/ui/space_info.py
branches/soc-2010-leifandersen/release/scripts/ui/space_logic.py
branches/soc-2010-leifandersen/release/scripts/ui/space_node.py
branches/soc-2010-leifandersen/release/scripts/ui/space_sequencer.py
branches/soc-2010-leifandersen/release/scripts/ui/space_text.py
branches/soc-2010-leifandersen/release/scripts/ui/space_time.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-leifandersen/release/test/rna_info_dump.py
branches/soc-2010-leifandersen/release/windows/extra/Help.url
branches/soc-2010-leifandersen/release/windows/installer/00.sconsblender.nsi
branches/soc-2010-leifandersen/source/blender/blenfont/intern/blf_font.c
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_exotic.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_image.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_modifier.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_node.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_unit.h
branches/soc-2010-leifandersen/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/anim.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/boids.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/brush.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/effect.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/exotic.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/multires.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/node.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/object.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/seqcache.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/unit.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_math_color.h
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_storage.h
branches/soc-2010-leifandersen/source/blender/blenlib/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/blenlib/intern/bpath.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/dynlib.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/fileops.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/math_color.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/path_util.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/storage.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/winstuff.c
branches/soc-2010-leifandersen/source/blender/blenloader/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/readfile.c
branches/soc-2010-leifandersen/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-leifandersen/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-leifandersen/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2010-leifandersen/source/blender/editors/animation/anim_markers.c
branches/soc-2010-leifandersen/source/blender/editors/armature/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/armature/armature_intern.h
branches/soc-2010-leifandersen/source/blender/editors/armature/armature_ops.c
branches/soc-2010-leifandersen/source/blender/editors/armature/editarmature.c
branches/soc-2010-leifandersen/source/blender/editors/armature/poseobject.c
branches/soc-2010-leifandersen/source/blender/editors/curve/editcurve.c
branches/soc-2010-leifandersen/source/blender/editors/curve/editfont.c
branches/soc-2010-leifandersen/source/blender/editors/datafiles/splash.png.c
branches/soc-2010-leifandersen/source/blender/editors/include/ED_armature.h
branches/soc-2010-leifandersen/source/blender/editors/include/ED_screen_types.h
branches/soc-2010-leifandersen/source/blender/editors/include/UI_interface.h
branches/soc-2010-leifandersen/source/blender/editors/interface/interface.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_draw.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_intern.h
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-leifandersen/source/blender/editors/object/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/object/object_constraint.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_transform.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_vgroup.c
branches/soc-2010-leifandersen/source/blender/editors/physics/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/physics/particle_edit.c
branches/soc-2010-leifandersen/source/blender/editors/physics/particle_object.c
branches/soc-2010-leifandersen/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/screen/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/screen/area.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_edit.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_ops.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-leifandersen/source/blender/editors/sound/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_file/file_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/file_intern.h
branches/soc-2010-leifandersen/source/blender/editors/space_file/file_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/file_panels.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/filesel.c
branches/soc-2010-leifandersen/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_image/image_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_node/drawnode.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/node_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/node_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/space_node.c
branches/soc-2010-leifandersen/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-leifandersen/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-leifandersen/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_time/space_time.c
branches/soc-2010-leifandersen/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-leifandersen/source/blender/editors/transform/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/transform/transform.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_generics.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_ops.c
branches/soc-2010-leifandersen/source/blender/editors/util/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/gpu/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/ikplugin/BIK_api.h
branches/soc-2010-leifandersen/source/blender/ikplugin/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/ikplugin/SConscript
branches/soc-2010-leifandersen/source/blender/ikplugin/intern/Makefile
branches/soc-2010-leifandersen/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2010-leifandersen/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2010-leifandersen/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-leifandersen/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2010-leifandersen/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/bmp.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2010-leifandersen/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2010-leifandersen/source/blender/imbuf/intern/filetype.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/iris.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/jp2.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/module.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-leifandersen/source/blender/imbuf/intern/openexr/openexr_api.h
branches/soc-2010-leifandersen/source/blender/imbuf/intern/png.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/readimage.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/targa.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/tiff.c
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_boid_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-leifandersen/source/blender/nodes/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2010-leifandersen/source/blender/python/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-leifandersen/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-leifandersen/source/blender/python/generic/bpy_internal_import.h
branches/soc-2010-leifandersen/source/blender/python/generic/py_capi_utils.c
branches/soc-2010-leifandersen/source/blender/python/generic/py_capi_utils.h
branches/soc-2010-leifandersen/source/blender/python/intern/bpy.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_interface.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_operator.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_props.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_props.h
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.h
branches/soc-2010-leifandersen/source/blender/quicktime/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2010-leifandersen/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2010-leifandersen/source/blender/readblenfile/intern/BLO_readblenfile.c
branches/soc-2010-leifandersen/source/blender/render/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2010-leifandersen/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-leifandersen/source/blender/windowmanager/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/windowmanager/WM_api.h
branches/soc-2010-leifandersen/source/blender/windowmanager/WM_types.h
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-leifandersen/source/blender/windowmanager/wm_event_types.h
branches/soc-2010-leifandersen/source/blender/windowmanager/wm_window.h
branches/soc-2010-leifandersen/source/blenderplayer/CMakeLists.txt
branches/soc-2010-leifandersen/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
branches/soc-2010-leifandersen/source/creator/creator.c
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_DeformableGameObject.h
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2010-leifandersen/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2010-leifandersen/source/gameengine/Converter/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/KX_SoftBodyDeformer.h
branches/soc-2010-leifandersen/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/Expressions/Value.h
branches/soc-2010-leifandersen/source/gameengine/Expressions/VectorValue.cpp
branches/soc-2010-leifandersen/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/soc-2010-leifandersen/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2010-leifandersen/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2010-leifandersen/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/soc-2010-leifandersen/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/soc-2010-leifandersen/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2010-leifandersen/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_TimeLogger.h
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/soc-2010-leifandersen/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
-----------
branches/soc-2010-leifandersen/build_files/package_spec/
branches/soc-2010-leifandersen/build_files/package_spec/pacman/
branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD
branches/soc-2010-leifandersen/build_files/package_spec/pacman/blender.install
branches/soc-2010-leifandersen/release/scripts/presets/keyconfig/
Removed Paths:
-------------
branches/soc-2010-leifandersen/build_files/package_spec/pacman/
branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD
branches/soc-2010-leifandersen/build_files/package_spec/pacman/blender.install
branches/soc-2010-leifandersen/release/scripts/cfg/
Modified: branches/soc-2010-leifandersen/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/CMakeLists.txt 2010-09-21 22:23:10 UTC (rev 32045)
+++ branches/soc-2010-leifandersen/CMakeLists.txt 2010-09-22 01:58:20 UTC (rev 32046)
@@ -70,6 +70,7 @@
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_IK_ITASC "Enable ITASC IK solver" ON)
OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
@@ -309,12 +310,12 @@
IF(WITH_OPENMP)
LIST(APPEND LLIBS -lgomp)
- LIST(APPEND CMAKE_C_FLAGS -fopenmp)
- LIST(APPEND CMAKE_CXX_FLAGS -fopenmp)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
+ SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -363,15 +364,6 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- IF(WITH_PYTHON)
- SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_VERSION 3.1)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
- # SET(PYTHON_BINARY python) # not used yet
- SET(PYTHON_LIB python31)
- SET(PYTHON_LIBPATH ${PYTHON}/lib)
- ENDIF(WITH_PYTHON)
-
IF(WITH_OPENAL)
SET(OPENAL ${LIBDIR}/openal)
SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
@@ -401,8 +393,7 @@
ENDIF(WITH_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
IF(MSVC)
@@ -529,6 +520,15 @@
SET(JACK_LIBPATH ${JACK}/lib)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
# MSVC only, Mingw doesnt need
IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
@@ -540,19 +540,12 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+ SET(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
- SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
+ # Better warnings
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
+ SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
- SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
- SET(CMAKE_CXX_FLAGS_RELEASE " -O2" CACHE STRING "Mingw release C++ flags ")
- SET(CMAKE_CXX_FLAGS_MINSIZEREL " -Os" CACHE STRING "Mingw minsize release C++ flags ")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
-
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C flags ")
- SET(CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "Mingw release C flags ")
- SET(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE STRING "Mingw minsize release C flags ")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
ADD_DEFINITIONS(-DFREE_WINDOWS)
IF(WITH_OPENMP)
@@ -616,6 +609,9 @@
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
+
+ # TODO, gives linking errors, force off
+ SET(WITH_IMAGE_OPENEXR OFF)
ENDIF(WITH_IMAGE_OPENEXR)
IF(WITH_IMAGE_TIFF)
@@ -635,6 +631,15 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
+ IF(WITH_PYTHON)
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_VERSION 3.1)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY python) # not used yet
+ SET(PYTHON_LIB python31mw)
+ SET(PYTHON_LIBPATH ${PYTHON}/lib)
+ ENDIF(WITH_PYTHON)
+
ENDIF(MSVC)
ENDIF(WIN32)
@@ -865,8 +870,7 @@
IF(CMAKE_COMPILER_IS_GNUCC)
IF(SUPPORT_SSE_BUILD)
SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(SUPPORT_SSE_BUILD)
IF(SUPPORT_SSE2_BUILD)
SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
Modified: branches/soc-2010-leifandersen/SConstruct
===================================================================
--- branches/soc-2010-leifandersen/SConstruct 2010-09-21 22:23:10 UTC (rev 32045)
+++ branches/soc-2010-leifandersen/SConstruct 2010-09-22 01:58:20 UTC (rev 32046)
@@ -492,6 +492,9 @@
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
+ # To ensure empty dirs are created too
+ if len(source)==0:
+ env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
Modified: branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py
===================================================================
--- branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py 2010-09-21 22:23:10 UTC (rev 32045)
+++ branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py 2010-09-22 01:58:20 UTC (rev 32046)
@@ -20,6 +20,7 @@
# <pep8 compliant>
+
def print_help(targets):
print("CMake quicky wrapper, no valid targets given.")
print(" * targets can contain a subset of the full target name.")
@@ -36,11 +37,11 @@
for t in targets:
print(" %s" % t)
print("...exiting")
-
+
def main():
targets = set()
-
+
# collect targets
file = open("Makefile", "r")
for line in file:
@@ -54,13 +55,12 @@
line = line.split(":", 1)[0]
- if "/" in line: # cmake terget options, dont need these
+ if "/" in line: # cmake terget options, dont need these
continue
targets.add(line)
file.close()
-
# remove cmake targets
bad = set([
"help",
@@ -75,10 +75,9 @@
"depend",
"cmake_check_build_system",
])
-
+
targets -= set(bad)
-
# parse args
targets = list(targets)
targets.sort()
@@ -106,7 +105,7 @@
print(" %s" % t)
print("...aborting.")
return
-
+
# execute
cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
print("cmake building with targets: %s" % " ".join(targets_new))
Copied: branches/soc-2010-leifandersen/build_files/package_spec (from rev 32045, trunk/blender/build_files/package_spec)
Copied: branches/soc-2010-leifandersen/build_files/package_spec/pacman (from rev 32045, trunk/blender/build_files/package_spec/pacman)
Deleted: branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD 2010-09-21 22:23:10 UTC (rev 32045)
+++ branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD 2010-09-22 01:58:20 UTC (rev 32046)
@@ -1,48 +0,0 @@
-# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
-
-# custom blender vars
-blender_srcdir=$srcdir/../../../..
-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_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_subversion
-
-pkgname=blender-beta
-pkgver=$blender_ver_string
-pkgrel=1
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-url="www.blender.org"
-license=('GPL')
-groups=()
-depends=('libjpeg' 'libpng' 'openexr' 'python3>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake' 'svn')
-optdepends=()
-provides=('blender')
-conflicts=('blender')
-replaces=()
-backup=()
-options=()
-install=blender.install
-# use current svn to make the package.
-# source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-# md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
-source=()
-md5sums=()
-noextract=()
-
-build() {
- mkdir -p $srcdir/build
- cd $srcdir/build
- cmake $blender_srcdir \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DWITH_PYTHON_INSTALL:BOOL=OFF \
- -DWITH_OPENCOLLADA:BOOL=OFF
-
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR="$pkgdir" install
-}
Copied: branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD (from rev 32045, trunk/blender/build_files/package_spec/pacman/PKGBUILD)
===================================================================
--- branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD (rev 0)
+++ branches/soc-2010-leifandersen/build_files/package_spec/pacman/PKGBUILD 2010-09-22 01:58:20 UTC (rev 32046)
@@ -0,0 +1,48 @@
+# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
+
+# custom blender vars
+blender_srcdir=$srcdir/../../../..
+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_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_subversion
+
+pkgname=blender-beta
+pkgver=$blender_ver_string
+pkgrel=1
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+url="www.blender.org"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list