[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36881] branches/soc-2010-jwilkins: Merged with trunk: 30832-31359
Jason Wilkins
Jason.A.Wilkins at gmail.com
Tue May 24 22:28:16 CEST 2011
Revision: 36881
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36881
Author: jwilkins
Date: 2011-05-24 20:28:15 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Merged with trunk: 30832-31359
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/SConstruct
branches/soc-2010-jwilkins/build_files/cmake/macros.cmake
branches/soc-2010-jwilkins/build_files/make/nan_compile.mk
branches/soc-2010-jwilkins/build_files/make/nan_definitions.mk
branches/soc-2010-jwilkins/build_files/make/nan_link.mk
branches/soc-2010-jwilkins/build_files/scons/config/win32-vc-config.py
branches/soc-2010-jwilkins/build_files/scons/config/win64-vc-config.py
branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
branches/soc-2010-jwilkins/build_files/scons/tools/btools.py
branches/soc-2010-jwilkins/extern/CMakeLists.txt
branches/soc-2010-jwilkins/intern/CMakeLists.txt
branches/soc-2010-jwilkins/intern/ghost/SConscript
branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-jwilkins/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2010-jwilkins/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2010-jwilkins/release/Makefile
branches/soc-2010-jwilkins/release/plugins/Makefile
branches/soc-2010-jwilkins/release/plugins/bmake
branches/soc-2010-jwilkins/release/plugins/sequence/Makefile
branches/soc-2010-jwilkins/release/plugins/texture/Makefile
branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py
branches/soc-2010-jwilkins/release/scripts/io/export_fbx.py
branches/soc-2010-jwilkins/release/scripts/io/export_mdd.py
branches/soc-2010-jwilkins/release/scripts/io/export_obj.py
branches/soc-2010-jwilkins/release/scripts/io/export_ply.py
branches/soc-2010-jwilkins/release/scripts/io/export_x3d.py
branches/soc-2010-jwilkins/release/scripts/io/import_anim_bvh.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_obj.py
branches/soc-2010-jwilkins/release/scripts/io/import_shape_mdd.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/__init__.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/client.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/master.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/operators.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/repath.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/slave.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/ui.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/utils.py
branches/soc-2010-jwilkins/release/scripts/modules/add_object_utils.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/__init__.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy_types.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/__init__.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-jwilkins/release/scripts/modules/rna_info.py
branches/soc-2010-jwilkins/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-jwilkins/release/scripts/op/add_armature_human.py
branches/soc-2010-jwilkins/release/scripts/op/add_mesh_torus.py
branches/soc-2010-jwilkins/release/scripts/op/console_python.py
branches/soc-2010-jwilkins/release/scripts/op/console_shell.py
branches/soc-2010-jwilkins/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-jwilkins/release/scripts/op/image.py
branches/soc-2010-jwilkins/release/scripts/op/mesh.py
branches/soc-2010-jwilkins/release/scripts/op/nla.py
branches/soc-2010-jwilkins/release/scripts/op/object.py
branches/soc-2010-jwilkins/release/scripts/op/object_align.py
branches/soc-2010-jwilkins/release/scripts/op/object_randomize_transform.py
branches/soc-2010-jwilkins/release/scripts/op/presets.py
branches/soc-2010-jwilkins/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2010-jwilkins/release/scripts/op/sequencer.py
branches/soc-2010-jwilkins/release/scripts/op/uv.py
branches/soc-2010-jwilkins/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-jwilkins/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-jwilkins/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-jwilkins/release/scripts/op/wm.py
branches/soc-2010-jwilkins/release/scripts/templates/gamelogic.py
branches/soc-2010-jwilkins/release/scripts/templates/operator.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_draw.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_simple.py
branches/soc-2010-jwilkins/release/scripts/templates/operator_uv.py
branches/soc-2010-jwilkins/release/scripts/templates/panel_simple.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_animviz.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_bone.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_camera.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_curve.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_empty.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_game.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_material.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_common.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_field.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_render.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_scene.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_world.py
branches/soc-2010-jwilkins/release/scripts/ui/space_console.py
branches/soc-2010-jwilkins/release/scripts/ui/space_dopesheet.py
branches/soc-2010-jwilkins/release/scripts/ui/space_filebrowser.py
branches/soc-2010-jwilkins/release/scripts/ui/space_graph.py
branches/soc-2010-jwilkins/release/scripts/ui/space_image.py
branches/soc-2010-jwilkins/release/scripts/ui/space_info.py
branches/soc-2010-jwilkins/release/scripts/ui/space_logic.py
branches/soc-2010-jwilkins/release/scripts/ui/space_nla.py
branches/soc-2010-jwilkins/release/scripts/ui/space_node.py
branches/soc-2010-jwilkins/release/scripts/ui/space_outliner.py
branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
branches/soc-2010-jwilkins/release/scripts/ui/space_text.py
branches/soc-2010-jwilkins/release/scripts/ui/space_time.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/release/text/copyright.txt
branches/soc-2010-jwilkins/source/Makefile
branches/soc-2010-jwilkins/source/blender/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/Makefile
branches/soc-2010-jwilkins/source/blender/SConscript
branches/soc-2010-jwilkins/source/blender/avi/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/avi/Makefile
branches/soc-2010-jwilkins/source/blender/avi/intern/Makefile
branches/soc-2010-jwilkins/source/blender/blenfont/Makefile
branches/soc-2010-jwilkins/source/blender/blenfont/intern/Makefile
branches/soc-2010-jwilkins/source/blender/blenfont/intern/blf_font.c
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_anim.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_armature.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_cloth.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_collision.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_colortools.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_displist.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_effect.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_image.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_library.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_main.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_material.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_mesh.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_node.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sca.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_text.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-jwilkins/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenkernel/Makefile
branches/soc-2010-jwilkins/source/blender/blenkernel/SConscript
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/Makefile
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/action.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/armature.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/blender.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/boids.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/collision.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/effect.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/group.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idprop.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/implicit.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/ipo.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/key.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/lattice.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/library.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/nla.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/node.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/paint.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/scene.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sketch.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sound.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/texture.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/world.c
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_ghash.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_listbase.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-jwilkins/source/blender/blenlib/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenlib/Makefile
branches/soc-2010-jwilkins/source/blender/blenlib/intern/Makefile
branches/soc-2010-jwilkins/source/blender/blenlib/intern/bpath.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/listbase.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_rotation.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_vector.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/path_util.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/storage.c
branches/soc-2010-jwilkins/source/blender/blenloader/BLO_readfile.h
branches/soc-2010-jwilkins/source/blender/blenloader/Makefile
branches/soc-2010-jwilkins/source/blender/blenloader/intern/Makefile
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/undofile.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
branches/soc-2010-jwilkins/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/blenpluginapi/Makefile
branches/soc-2010-jwilkins/source/blender/blenpluginapi/intern/Makefile
branches/soc-2010-jwilkins/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-jwilkins/source/blender/collada/Makefile
branches/soc-2010-jwilkins/source/blender/collada/SConscript
branches/soc-2010-jwilkins/source/blender/editors/Makefile
branches/soc-2010-jwilkins/source/blender/editors/animation/Makefile
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-jwilkins/source/blender/editors/animation/anim_filter.c
branches/soc-2010-jwilkins/source/blender/editors/animation/drivers.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_draw.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_edit.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframes_general.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyframing.c
branches/soc-2010-jwilkins/source/blender/editors/animation/keyingsets.c
branches/soc-2010-jwilkins/source/blender/editors/armature/Makefile
branches/soc-2010-jwilkins/source/blender/editors/armature/armature_ops.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_generate.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-jwilkins/source/blender/editors/armature/meshlaplacian.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poseSlide.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poseUtils.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poselib.c
branches/soc-2010-jwilkins/source/blender/editors/armature/poseobject.c
branches/soc-2010-jwilkins/source/blender/editors/armature/reeb.c
branches/soc-2010-jwilkins/source/blender/editors/curve/Makefile
branches/soc-2010-jwilkins/source/blender/editors/curve/curve_ops.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editfont.c
branches/soc-2010-jwilkins/source/blender/editors/datafiles/Makefile
branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-jwilkins/source/blender/editors/gpencil/Makefile
branches/soc-2010-jwilkins/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-jwilkins/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2010-jwilkins/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2010-jwilkins/source/blender/editors/include/ED_armature.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_object.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_view3d.h
branches/soc-2010-jwilkins/source/blender/editors/include/UI_interface.h
branches/soc-2010-jwilkins/source/blender/editors/interface/Makefile
branches/soc-2010-jwilkins/source/blender/editors/interface/interface.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_anim.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_draw.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_icons.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_layout.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_ops.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_panel.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_regions.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_style.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-jwilkins/source/blender/editors/interface/resources.c
branches/soc-2010-jwilkins/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/Makefile
branches/soc-2010-jwilkins/source/blender/editors/mesh/editface.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/loopcut.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-jwilkins/source/blender/editors/mesh/meshtools.c
branches/soc-2010-jwilkins/source/blender/editors/metaball/Makefile
branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-jwilkins/source/blender/editors/object/Makefile
branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_bake.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_edit.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_intern.h
branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_modifier.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_ops.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_shapekey.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
branches/soc-2010-jwilkins/source/blender/editors/physics/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/physics/Makefile
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_boids.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_object.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_ops.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-jwilkins/source/blender/editors/render/Makefile
branches/soc-2010-jwilkins/source/blender/editors/render/render_internal.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_opengl.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
branches/soc-2010-jwilkins/source/blender/editors/screen/Makefile
branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_context.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_edit.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screendump.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/Makefile
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-jwilkins/source/blender/editors/sound/Makefile
branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/action_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_action/space_action.c
branches/soc-2010-jwilkins/source/blender/editors/space_api/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_api/space.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/console_report.c
branches/soc-2010-jwilkins/source/blender/editors/space_console/space_console.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_file/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_file/file_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/filelist.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/filesel.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/fsmenu.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/space_file.c
branches/soc-2010-jwilkins/source/blender/editors/space_file/writeimage.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/graph_utils.c
branches/soc-2010-jwilkins/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/editors/space_image/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_render.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/space_image.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/info_stats.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-jwilkins/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_channels.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_nla/space_nla.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_node/drawnode.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/space_node.c
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-jwilkins/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_script/script_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/script_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/script_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_script/space_script.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_sound/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_sound/sound_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_sound/space_sound.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_text/space_text.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_time/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_time/space_time.c
branches/soc-2010-jwilkins/source/blender/editors/space_time/time_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_userpref/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/Makefile
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-jwilkins/source/blender/editors/transform/Makefile
branches/soc-2010-jwilkins/source/blender/editors/transform/transform.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_generics.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_ops.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_snap.c
branches/soc-2010-jwilkins/source/blender/editors/util/Makefile
branches/soc-2010-jwilkins/source/blender/editors/util/ed_util.c
branches/soc-2010-jwilkins/source/blender/editors/util/editmode_undo.c
branches/soc-2010-jwilkins/source/blender/editors/util/numinput.c
branches/soc-2010-jwilkins/source/blender/editors/util/undo.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/Makefile
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-jwilkins/source/blender/gpu/Makefile
branches/soc-2010-jwilkins/source/blender/gpu/intern/Makefile
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2010-jwilkins/source/blender/ikplugin/Makefile
branches/soc-2010-jwilkins/source/blender/ikplugin/intern/Makefile
branches/soc-2010-jwilkins/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2010-jwilkins/source/blender/imbuf/Makefile
branches/soc-2010-jwilkins/source/blender/imbuf/SConscript
branches/soc-2010-jwilkins/source/blender/imbuf/intern/Makefile
branches/soc-2010-jwilkins/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/intern/cineon/Makefile
branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/intern/dds/Makefile
branches/soc-2010-jwilkins/source/blender/imbuf/intern/filetype.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/imbuf/intern/openexr/Makefile
branches/soc-2010-jwilkins/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/tiff.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/util.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_ID.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_image_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_sound_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/Makefile
branches/soc-2010-jwilkins/source/blender/makesdna/intern/Makefile
branches/soc-2010-jwilkins/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-jwilkins/source/blender/makesrna/Makefile
branches/soc-2010-jwilkins/source/blender/makesrna/RNA_access.h
branches/soc-2010-jwilkins/source/blender/makesrna/RNA_define.h
branches/soc-2010-jwilkins/source/blender/makesrna/SConscript
branches/soc-2010-jwilkins/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/makesrna/intern/Makefile
branches/soc-2010-jwilkins/source/blender/makesrna/intern/SConscript
branches/soc-2010-jwilkins/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_context.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_key.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_main.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_material_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_rna.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_screen.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_text.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-jwilkins/source/blender/modifiers/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2010-jwilkins/source/blender/modifiers/Makefile
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_array.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_none.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_util.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_util.h
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2010-jwilkins/source/blender/modifiers/intern/Makefile
branches/soc-2010-jwilkins/source/blender/nodes/Makefile
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/CMP_value.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soc-2010-jwilkins/source/blender/nodes/intern/Makefile
branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2010-jwilkins/source/blender/nodes/intern/SHD_nodes/SHD_value.c
branches/soc-2010-jwilkins/source/blender/nodes/intern/TEX_nodes/Makefile
branches/soc-2010-jwilkins/source/blender/python/Makefile
branches/soc-2010-jwilkins/source/blender/python/SConscript
branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-jwilkins/source/blender/python/generic/Makefile
branches/soc-2010-jwilkins/source/blender/python/generic/bgl.c
branches/soc-2010-jwilkins/source/blender/python/generic/blf_api.c
branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-jwilkins/source/blender/python/generic/bpy_internal_import.h
branches/soc-2010-jwilkins/source/blender/python/generic/geometry.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils.h
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_color.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-jwilkins/source/blender/python/generic/noise.c
branches/soc-2010-jwilkins/source/blender/python/intern/Makefile
branches/soc-2010-jwilkins/source/blender/python/intern/bpy.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_props.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_util.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_util.h
branches/soc-2010-jwilkins/source/blender/quicktime/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/quicktime/Makefile
branches/soc-2010-jwilkins/source/blender/quicktime/apple/Makefile
branches/soc-2010-jwilkins/source/blender/readblenfile/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/readblenfile/Makefile
branches/soc-2010-jwilkins/source/blender/readblenfile/intern/Makefile
branches/soc-2010-jwilkins/source/blender/readblenfile/stub/Makefile
branches/soc-2010-jwilkins/source/blender/readblenfile/test/Makefile
branches/soc-2010-jwilkins/source/blender/render/CMakeLists.txt
branches/soc-2010-jwilkins/source/blender/render/Makefile
branches/soc-2010-jwilkins/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-jwilkins/source/blender/render/intern/Makefile
branches/soc-2010-jwilkins/source/blender/render/intern/include/render_types.h
branches/soc-2010-jwilkins/source/blender/render/intern/include/renderdatabase.h
branches/soc-2010-jwilkins/source/blender/render/intern/include/texture.h
branches/soc-2010-jwilkins/source/blender/render/intern/raytrace/Makefile
branches/soc-2010-jwilkins/source/blender/render/intern/source/convertblender.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/envmap.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/pipeline.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rayshade.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/renderdatabase.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/sss.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/texture.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/volumetric.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/voxeldata.c
branches/soc-2010-jwilkins/source/blender/verify/Makefile
branches/soc-2010-jwilkins/source/blender/verify/intern/Makefile
branches/soc-2010-jwilkins/source/blender/windowmanager/Makefile
branches/soc-2010-jwilkins/source/blender/windowmanager/WM_api.h
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/Makefile
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/Makefile
branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
branches/soc-2010-jwilkins/source/creator/Makefile
branches/soc-2010-jwilkins/source/creator/SConscript
branches/soc-2010-jwilkins/source/creator/creator.c
branches/soc-2010-jwilkins/source/darwin/Makefile
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/BlenderRoutines/Makefile
branches/soc-2010-jwilkins/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/soc-2010-jwilkins/source/gameengine/Converter/Makefile
branches/soc-2010-jwilkins/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Expressions/Makefile
branches/soc-2010-jwilkins/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/GameLogic/Joystick/Makefile
branches/soc-2010-jwilkins/source/gameengine/GameLogic/Makefile
branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/unix/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/common/windows/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/src/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/src/xpcom/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/test/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/test/colorcycle/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/test/gears/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/test/stub/Makefile
branches/soc-2010-jwilkins/source/gameengine/GamePlayer/netscape/test/threaded_gears/Makefile
branches/soc-2010-jwilkins/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/Makefile
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/Makefile
branches/soc-2010-jwilkins/source/gameengine/Makefile
branches/soc-2010-jwilkins/source/gameengine/Network/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Network/LoopBackNetwork/Makefile
branches/soc-2010-jwilkins/source/gameengine/Network/Makefile
branches/soc-2010-jwilkins/source/gameengine/Network/TerraplayNetwork/Makefile
branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Physics/Bullet/Makefile
branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Physics/Dummy/Makefile
branches/soc-2010-jwilkins/source/gameengine/Physics/Makefile
branches/soc-2010-jwilkins/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Physics/common/Makefile
branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.types.rst
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/Makefile
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2010-jwilkins/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/SceneGraph/Makefile
branches/soc-2010-jwilkins/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2010-jwilkins/source/gameengine/VideoTexture/Makefile
branches/soc-2010-jwilkins/source/icons/Makefile
branches/soc-2010-jwilkins/source/kernel/CMakeLists.txt
branches/soc-2010-jwilkins/source/kernel/Makefile
branches/soc-2010-jwilkins/source/kernel/gen_messaging/Makefile
branches/soc-2010-jwilkins/source/kernel/gen_messaging/intern/Makefile
branches/soc-2010-jwilkins/source/kernel/gen_system/Makefile
branches/soc-2010-jwilkins/source/tools/guess/guessconfig
Added Paths:
-----------
branches/soc-2010-jwilkins/build_files/scons/config/freebsd7-config.py
branches/soc-2010-jwilkins/build_files/scons/config/freebsd8-config.py
branches/soc-2010-jwilkins/build_files/scons/config/freebsd9-config.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/path.py
branches/soc-2010-jwilkins/release/scripts/modules/bpyml.py
branches/soc-2010-jwilkins/release/scripts/modules/bpyml_ui.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_idcode.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/idcode.c
branches/soc-2010-jwilkins/source/blender/editors/include/ED_lattice.h
Removed Paths:
-------------
branches/soc-2010-jwilkins/release/scripts/io/engine_render_pov.py
branches/soc-2010-jwilkins/release/scripts/ui/space_buttons.py
branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_header.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_wave_types.h
branches/soc-2010-jwilkins/source/gameengine/PyDoc/SConscript
Property Changed:
----------------
branches/soc-2010-jwilkins/
branches/soc-2010-jwilkins/release/scripts/io/import_anim_bvh.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_obj.py
branches/soc-2010-jwilkins/release/scripts/io/netrender/repath.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/ops.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/__init__.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/arm_biped.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/finger_curl.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/leg_biped.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/neck_flex.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/palm_curl.py
branches/soc-2010-jwilkins/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-jwilkins/release/scripts/op/add_mesh_torus.py
branches/soc-2010-jwilkins/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-jwilkins/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/chicken.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/cream.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/ketchup.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/marble.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/potato.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/skim_milk.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/skin1.py
branches/soc-2010-jwilkins/release/scripts/presets/sss/skin2.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_bone.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_camera.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_empty.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_game.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_material.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_field.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_texture.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_world.py
branches/soc-2010-jwilkins/release/scripts/ui/space_node.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-jwilkins/source/blender/editors/include/ED_particle.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_physics.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_render.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_retopo.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_transform.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_intern.h
branches/soc-2010-jwilkins/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-jwilkins/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_constraint.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_group.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_hook.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_lattice.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_relations.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_select.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_shapekey.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_transform.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_vgroup.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_boids.c
branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_fluid.c
branches/soc-2010-jwilkins/source/blender/editors/physics/physics_pointcache.c
branches/soc-2010-jwilkins/source/blender/editors/render/
branches/soc-2010-jwilkins/source/blender/editors/render/render_intern.h
branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/info_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_node/node_state.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_userpref/
branches/soc-2010-jwilkins/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2010-jwilkins/source/blender/editors/space_userpref/userpref_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_userpref/userpref_ops.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2010-jwilkins/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-jwilkins/source/blender/gpu/GPU_buffers.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c
Property changes on: branches/soc-2010-jwilkins
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/blender:30832-31359
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2011-05-24 20:02:24 UTC (rev 36880)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2011-05-24 20:28:15 UTC (rev 36881)
@@ -69,7 +69,7 @@
OPTION(WITH_LCMS "Enable color correction with lcms" OFF)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
-OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" 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)
@@ -82,10 +82,12 @@
ENDIF()
# Image format support
-OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
-OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
-OPTION(WITH_TIFF "Enable LibTIFF Support" ON)
-OPTION(WITH_DDS "Enable DDS Support" ON)
+OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
+OPTION(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
+OPTION(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
+OPTION(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
+OPTION(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
# Audio format support
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
@@ -221,7 +223,7 @@
ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL)
- IF(WITH_OPENEXR)
+ IF(WITH_IMAGE_OPENEXR)
SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
FIND_PATH(OPENEXR_INC
ImfXdr.h
@@ -236,16 +238,16 @@
SET(OPENEXR_LIB Half IlmImf Iex Imath)
IF(NOT OPENEXR_INC)
- SET(WITH_OPENEXR OFF)
+ SET(WITH_IMAGE_OPENEXR OFF)
ENDIF(NOT OPENEXR_INC)
- ENDIF(WITH_OPENEXR)
+ ENDIF(WITH_IMAGE_OPENEXR)
- IF(WITH_TIFF)
+ IF(WITH_IMAGE_TIFF)
FIND_PACKAGE(TIFF)
IF(NOT TIFF_FOUND)
- SET(WITH_TIFF OFF)
+ SET(WITH_IMAGE_TIFF OFF)
ENDIF(NOT TIFF_FOUND)
- ENDIF(WITH_TIFF)
+ ENDIF(WITH_IMAGE_TIFF)
FIND_PACKAGE(JPEG REQUIRED)
@@ -315,12 +317,6 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
- IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
- ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
IF(WITH_ONSURFACEBRUSH)
ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
ENDIF(WITH_ONSURFACEBRUSH)
@@ -506,7 +502,7 @@
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
ENDIF(WITH_FFMPEG)
- IF(WITH_OPENEXR)
+ 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)
@@ -518,14 +514,14 @@
IF (MSVC90)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
ENDIF(MSVC90)
- ENDIF(WITH_OPENEXR)
+ ENDIF(WITH_IMAGE_OPENEXR)
- IF(WITH_TIFF)
+ IF(WITH_IMAGE_TIFF)
SET(TIFF ${LIBDIR}/tiff)
SET(TIFF_LIBRARY libtiff)
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
SET(TIFF_LIBPATH ${TIFF}/lib)
- ENDIF(WITH_TIFF)
+ ENDIF(WITH_IMAGE_TIFF)
IF(WITH_JACK)
SET(JACK ${LIBDIR}/jack)
@@ -616,19 +612,19 @@
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
ENDIF(WITH_FFMPEG)
- IF(WITH_OPENEXR)
+ IF(WITH_IMAGE_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
- ENDIF(WITH_OPENEXR)
+ ENDIF(WITH_IMAGE_OPENEXR)
- IF(WITH_TIFF)
+ IF(WITH_IMAGE_TIFF)
SET(TIFF ${LIBDIR}/gcc/tiff)
SET(TIFF_LIBRARY tiff)
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
SET(TIFF_LIBPATH ${TIFF}/lib)
- ENDIF(WITH_TIFF)
+ ENDIF(WITH_IMAGE_TIFF)
IF(WITH_JACK)
SET(JACK ${LIBDIR}/jack)
@@ -640,12 +636,6 @@
SET(WITH_JACK OFF)
ENDIF(WITH_JACK)
- IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
- ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
ENDIF(MSVC)
ENDIF(WIN32)
@@ -736,12 +726,12 @@
SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
SET(FREETYPE_LIBRARY freetype)
- IF(WITH_OPENEXR)
+ IF(WITH_IMAGE_OPENEXR)
SET(OPENEXR ${LIBDIR}/openexr)
SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include)
SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
- ENDIF(WITH_OPENEXR)
+ ENDIF(WITH_IMAGE_OPENEXR)
IF(WITH_LCMS)
SET(LCMS ${LIBDIR}/lcms)
@@ -819,19 +809,13 @@
SET(JPEG_INC "${JPEG}/include")
SET(JPEG_LIBPATH ${JPEG}/lib)
- IF(WITH_TIFF)
+ IF(WITH_IMAGE_TIFF)
SET(TIFF ${LIBDIR}/tiff)
SET(TIFF_INCLUDE_DIR ${TIFF}/include)
SET(TIFF_LIBRARY tiff)
SET(TIFF_LIBPATH ${TIFF}/lib)
- ENDIF(WITH_TIFF)
+ ENDIF(WITH_IMAGE_TIFF)
- IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
- ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-
IF(WITH_ONSURFACEBRUSH)
ADD_DEFINITIONS(-DWITH_ONSURFACEBRUSH)
ENDIF(WITH_ONSURFACEBRUSH)
@@ -879,14 +863,31 @@
ENDIF(BUILD_REV_RETURN)
ENDIF(WIN32)
ENDIF(WITH_BUILDINFO)
-
#-----------------------------------------------------------------------------
# Common.
-IF(WITH_OPENJPEG)
+
+IF(WITH_RAYOPTIMIZATION)
+ IF(CMAKE_COMPILER_IS_GNUCC)
+ IF(SUPPORT_SSE_BUILD)
+ SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
+ ADD_DEFINITIONS(-D__SSE__)
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(SUPPORT_SSE_BUILD)
+ IF(SUPPORT_SSE2_BUILD)
+ SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
+ ADD_DEFINITIONS(-D__SSE2__)
+ IF(NOT SUPPORT_SSE_BUILD) # dont double up
+ ADD_DEFINITIONS(-D__MMX__)
+ ENDIF(NOT SUPPORT_SSE_BUILD)
+ ENDIF(SUPPORT_SSE2_BUILD)
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ENDIF(WITH_RAYOPTIMIZATION)
+
+IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
set(OPENJPEG_LIb extern_libopenjpeg)
-ENDIF(WITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
#-----------------------------------------------------------------------------
# Blender WebPlugin
Modified: branches/soc-2010-jwilkins/SConstruct
===================================================================
--- branches/soc-2010-jwilkins/SConstruct 2011-05-24 20:02:24 UTC (rev 36880)
+++ branches/soc-2010-jwilkins/SConstruct 2011-05-24 20:28:15 UTC (rev 36881)
@@ -210,15 +210,37 @@
print B.bc.OKGREEN + "Build with parallel jobs%s: %s" % (B.bc.ENDC, GetOption('num_jobs'))
print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
-# BLENDERPATH is a unix only option to enable typical style paths this is
-# spesifically a data-dir, which is used a lot but cant replace BF_INSTALLDIR
-# because the blender binary is installed in $BF_INSTALLDIR/bin/blender
+if 'blenderlite' in B.targets:
+ target_env_defs = {}
+ target_env_defs['WITH_BF_GAMEENGINE'] = False
+ target_env_defs['WITH_BF_OPENAL'] = False
+ target_env_defs['WITH_BF_OPENEXR'] = False
+ target_env_defs['WITH_BF_OPENMP'] = False
+ target_env_defs['WITH_BF_ICONV'] = False
+ target_env_defs['WITH_BF_INTERNATIONAL'] = False
+ target_env_defs['WITH_BF_OPENJPEG'] = False
+ target_env_defs['WITH_BF_FFMPEG'] = False
+ target_env_defs['WITH_BF_QUICKTIME'] = False
+ target_env_defs['WITH_BF_REDCODE'] = False
+ target_env_defs['WITH_BF_DDS'] = False
+ target_env_defs['WITH_BF_CINEON'] = False
+ target_env_defs['WITH_BF_HDR'] = False
+ target_env_defs['WITH_BF_ZLIB'] = False
+ target_env_defs['WITH_BF_SDL'] = False
+ target_env_defs['WITH_BF_JPEG'] = False
+ target_env_defs['WITH_BF_PNG'] = False
+ target_env_defs['WITH_BF_BULLET'] = False
+ target_env_defs['WITH_BF_BINRELOC'] = False
+ target_env_defs['BF_BUILDINFO'] = False
+ target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_PYTHON'] = False
-if env['WITH_BF_FHS']:
- BLENDERPATH = os.path.join(env['BF_INSTALLDIR'], 'share', 'blender', env['BF_VERSION'])
-else:
- BLENDERPATH = env['BF_INSTALLDIR']
+ # Merge blenderlite, let command line to override
+ for k,v in target_env_defs.iteritems():
+ if k not in B.arguments:
+ env[k] = v
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
@@ -271,34 +293,6 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
-if 'blenderlite' in B.targets:
- target_env_defs = {}
- target_env_defs['WITH_BF_GAMEENGINE'] = False
- target_env_defs['WITH_BF_OPENAL'] = False
- target_env_defs['WITH_BF_OPENEXR'] = False
- target_env_defs['WITH_BF_OPENMP'] = False
- target_env_defs['WITH_BF_ICONV'] = False
- target_env_defs['WITH_BF_INTERNATIONAL'] = False
- target_env_defs['WITH_BF_OPENJPEG'] = False
- target_env_defs['WITH_BF_FFMPEG'] = False
- target_env_defs['WITH_BF_QUICKTIME'] = False
- target_env_defs['WITH_BF_REDCODE'] = False
- target_env_defs['WITH_BF_DDS'] = False
- target_env_defs['WITH_BF_ZLIB'] = False
- target_env_defs['WITH_BF_SDL'] = False
- target_env_defs['WITH_BF_JPEG'] = False
- target_env_defs['WITH_BF_PNG'] = False
- target_env_defs['WITH_BF_BULLET'] = False
- target_env_defs['WITH_BF_BINRELOC'] = False
- target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
- target_env_defs['WITH_BF_PYTHON'] = False
-
- # Merge blenderlite, let command line to override
- for k,v in target_env_defs.iteritems():
- if k not in B.arguments:
- env[k] = v
-
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
@@ -311,7 +305,7 @@
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
-B.doc_build_dir = os.path.join(BLENDERPATH, 'doc')
+B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list