Revision: 31186 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31186 Author: leifandersen Date: 2010-08-09 05:02:20 +0200 (Mon, 09 Aug 2010)
Log Message: ----------- Merge with trunk: svn merge -r 30987:31185 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ . Modified Paths: -------------- branches/soc-2010-leifandersen/CMakeLists.txt branches/soc-2010-leifandersen/SConstruct branches/soc-2010-leifandersen/build_files/cmake/macros.cmake branches/soc-2010-leifandersen/build_files/make/nan_compile.mk branches/soc-2010-leifandersen/build_files/make/nan_definitions.mk branches/soc-2010-leifandersen/build_files/make/nan_link.mk branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py branches/soc-2010-leifandersen/build_files/scons/tools/btools.py branches/soc-2010-leifandersen/extern/CMakeLists.txt branches/soc-2010-leifandersen/intern/CMakeLists.txt branches/soc-2010-leifandersen/release/scripts/io/export_3ds.py branches/soc-2010-leifandersen/release/scripts/io/export_fbx.py branches/soc-2010-leifandersen/release/scripts/io/export_mdd.py branches/soc-2010-leifandersen/release/scripts/io/export_obj.py branches/soc-2010-leifandersen/release/scripts/io/export_ply.py branches/soc-2010-leifandersen/release/scripts/io/export_x3d.py branches/soc-2010-leifandersen/release/scripts/io/import_shape_mdd.py branches/soc-2010-leifandersen/release/scripts/io/netrender/client.py branches/soc-2010-leifandersen/release/scripts/io/netrender/operators.py branches/soc-2010-leifandersen/release/scripts/io/netrender/repath.py branches/soc-2010-leifandersen/release/scripts/io/netrender/ui.py branches/soc-2010-leifandersen/release/scripts/modules/bpy/__init__.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/rigify/__init__.py branches/soc-2010-leifandersen/release/scripts/modules/rna_prop_ui.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/mesh.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/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_follow_active.py branches/soc-2010-leifandersen/release/scripts/op/uvcalc_smart_project.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_simple.py branches/soc-2010-leifandersen/release/scripts/templates/operator_uv.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_camera.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_data_metaball.py branches/soc-2010-leifandersen/release/scripts/ui/properties_data_modifier.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_image.py branches/soc-2010-leifandersen/release/scripts/ui/space_logic.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_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/source/Makefile branches/soc-2010-leifandersen/source/blender/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/SConscript branches/soc-2010-leifandersen/source/blender/avi/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/blenfont/intern/blf_font.c branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_anim.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_brush.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_curve.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_displist.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_library.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_main.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mesh.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_node.h branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_paint.h branches/soc-2010-leifandersen/source/blender/blenkernel/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/blenkernel/SConscript branches/soc-2010-leifandersen/source/blender/blenkernel/intern/Makefile branches/soc-2010-leifandersen/source/blender/blenkernel/intern/action.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/anim.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/armature.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/blender.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/brush.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/colortools.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/curve.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/displist.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/font.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/ipo.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/lattice.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/library.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/mesh.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/paint.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle_system.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/scene.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/seqeffects.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/sequencer.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/sound.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/text.c branches/soc-2010-leifandersen/source/blender/blenkernel/intern/world.c branches/soc-2010-leifandersen/source/blender/blenlib/BLI_path_util.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/path_util.c 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/blenloader/intern/undofile.c branches/soc-2010-leifandersen/source/blender/blenloader/intern/writefile.c branches/soc-2010-leifandersen/source/blender/blenpluginapi/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/editors/animation/anim_channels_edit.c branches/soc-2010-leifandersen/source/blender/editors/animation/anim_filter.c branches/soc-2010-leifandersen/source/blender/editors/animation/keyframes_draw.c branches/soc-2010-leifandersen/source/blender/editors/animation/keyframes_edit.c branches/soc-2010-leifandersen/source/blender/editors/animation/keyframes_general.c branches/soc-2010-leifandersen/source/blender/editors/animation/keyframing.c branches/soc-2010-leifandersen/source/blender/editors/animation/keyingsets.c 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/editarmature_generate.c branches/soc-2010-leifandersen/source/blender/editors/armature/editarmature_retarget.c branches/soc-2010-leifandersen/source/blender/editors/armature/editarmature_sketch.c branches/soc-2010-leifandersen/source/blender/editors/armature/meshlaplacian.c branches/soc-2010-leifandersen/source/blender/editors/armature/poseSlide.c branches/soc-2010-leifandersen/source/blender/editors/armature/poseUtils.c branches/soc-2010-leifandersen/source/blender/editors/armature/poselib.c branches/soc-2010-leifandersen/source/blender/editors/armature/poseobject.c branches/soc-2010-leifandersen/source/blender/editors/armature/reeb.c branches/soc-2010-leifandersen/source/blender/editors/curve/curve_ops.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/startup.blend.c branches/soc-2010-leifandersen/source/blender/editors/gpencil/drawgpencil.c branches/soc-2010-leifandersen/source/blender/editors/gpencil/editaction_gpencil.c branches/soc-2010-leifandersen/source/blender/editors/gpencil/gpencil_buttons.c branches/soc-2010-leifandersen/source/blender/editors/gpencil/gpencil_edit.c branches/soc-2010-leifandersen/source/blender/editors/gpencil/gpencil_paint.c branches/soc-2010-leifandersen/source/blender/editors/include/ED_view3d.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_anim.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_icons.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_layout.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_ops.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_panel.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_regions.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_style.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_templates.c branches/soc-2010-leifandersen/source/blender/editors/interface/interface_widgets.c branches/soc-2010-leifandersen/source/blender/editors/interface/resources.c branches/soc-2010-leifandersen/source/blender/editors/interface/view2d_ops.c branches/soc-2010-leifandersen/source/blender/editors/mesh/editface.c 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_loop.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/mesh/loopcut.c branches/soc-2010-leifandersen/source/blender/editors/mesh/mesh_data.c branches/soc-2010-leifandersen/source/blender/editors/mesh/mesh_ops.c branches/soc-2010-leifandersen/source/blender/editors/mesh/meshtools.c branches/soc-2010-leifandersen/source/blender/editors/metaball/mball_edit.c branches/soc-2010-leifandersen/source/blender/editors/object/object_add.c branches/soc-2010-leifandersen/source/blender/editors/object/object_bake.c branches/soc-2010-leifandersen/source/blender/editors/object/object_constraint.c branches/soc-2010-leifandersen/source/blender/editors/object/object_edit.c branches/soc-2010-leifandersen/source/blender/editors/object/object_group.c branches/soc-2010-leifandersen/source/blender/editors/object/object_hook.c branches/soc-2010-leifandersen/source/blender/editors/object/object_intern.h branches/soc-2010-leifandersen/source/blender/editors/object/object_lattice.c branches/soc-2010-leifandersen/source/blender/editors/object/object_modifier.c branches/soc-2010-leifandersen/source/blender/editors/object/object_ops.c branches/soc-2010-leifandersen/source/blender/editors/object/object_relations.c branches/soc-2010-leifandersen/source/blender/editors/object/object_select.c branches/soc-2010-leifandersen/source/blender/editors/object/object_shapekey.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/physics_fluid.c branches/soc-2010-leifandersen/source/blender/editors/physics/physics_pointcache.c branches/soc-2010-leifandersen/source/blender/editors/render/render_internal.c branches/soc-2010-leifandersen/source/blender/editors/render/render_opengl.c branches/soc-2010-leifandersen/source/blender/editors/render/render_preview.c branches/soc-2010-leifandersen/source/blender/editors/render/render_shading.c branches/soc-2010-leifandersen/source/blender/editors/screen/area.c branches/soc-2010-leifandersen/source/blender/editors/screen/screen_context.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/screen/screendump.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_image.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_ops.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_stroke.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_utils.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_vertex.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt.c branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt_intern.h branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt_undo.c branches/soc-2010-leifandersen/source/blender/editors/sound/sound_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_action/action_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_action/action_edit.c branches/soc-2010-leifandersen/source/blender/editors/space_action/action_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_action/action_select.c branches/soc-2010-leifandersen/source/blender/editors/space_action/space_action.c branches/soc-2010-leifandersen/source/blender/editors/space_api/space.c branches/soc-2010-leifandersen/source/blender/editors/space_buttons/buttons_context.c branches/soc-2010-leifandersen/source/blender/editors/space_buttons/buttons_header.c branches/soc-2010-leifandersen/source/blender/editors/space_buttons/buttons_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_buttons/space_buttons.c branches/soc-2010-leifandersen/source/blender/editors/space_console/console_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_console/console_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_console/console_report.c branches/soc-2010-leifandersen/source/blender/editors/space_console/space_console.c branches/soc-2010-leifandersen/source/blender/editors/space_file/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/editors/space_file/Makefile branches/soc-2010-leifandersen/source/blender/editors/space_file/file_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_file/filelist.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_file/space_file.c branches/soc-2010-leifandersen/source/blender/editors/space_file/writeimage.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_buttons.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_edit.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_select.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_utils.c branches/soc-2010-leifandersen/source/blender/editors/space_graph/space_graph.c branches/soc-2010-leifandersen/source/blender/editors/space_image/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/editors/space_image/Makefile branches/soc-2010-leifandersen/source/blender/editors/space_image/image_buttons.c branches/soc-2010-leifandersen/source/blender/editors/space_image/image_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_image/image_header.c branches/soc-2010-leifandersen/source/blender/editors/space_image/image_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_image/image_render.c branches/soc-2010-leifandersen/source/blender/editors/space_image/space_image.c branches/soc-2010-leifandersen/source/blender/editors/space_info/info_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_info/info_stats.c branches/soc-2010-leifandersen/source/blender/editors/space_info/space_info.c branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_buttons.c branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_window.c branches/soc-2010-leifandersen/source/blender/editors/space_logic/space_logic.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_buttons.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_channels.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_edit.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_select.c branches/soc-2010-leifandersen/source/blender/editors/space_nla/space_nla.c branches/soc-2010-leifandersen/source/blender/editors/space_node/drawnode.c branches/soc-2010-leifandersen/source/blender/editors/space_node/node_buttons.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/node_header.c branches/soc-2010-leifandersen/source/blender/editors/space_node/node_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_node/node_select.c branches/soc-2010-leifandersen/source/blender/editors/space_node/node_state.c branches/soc-2010-leifandersen/source/blender/editors/space_node/space_node.c 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/script_edit.c branches/soc-2010-leifandersen/source/blender/editors/space_script/script_header.c branches/soc-2010-leifandersen/source/blender/editors/space_script/script_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_script/space_script.c branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_add.c branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_buttons.c branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_edit.c branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_select.c branches/soc-2010-leifandersen/source/blender/editors/space_sound/sound_header.c branches/soc-2010-leifandersen/source/blender/editors/space_sound/space_sound.c branches/soc-2010-leifandersen/source/blender/editors/space_text/space_text.c branches/soc-2010-leifandersen/source/blender/editors/space_text/text_draw.c branches/soc-2010-leifandersen/source/blender/editors/space_text/text_header.c branches/soc-2010-leifandersen/source/blender/editors/space_text/text_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_time/space_time.c branches/soc-2010-leifandersen/source/blender/editors/space_time/time_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawanimviz.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawarmature.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawmesh.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawobject.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawvolume.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/space_view3d.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_buttons.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_header.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_ops.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_select.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_snap.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_toolbar.c branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_view.c branches/soc-2010-leifandersen/source/blender/editors/transform/transform.c branches/soc-2010-leifandersen/source/blender/editors/transform/transform_constraints.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/transform/transform_orientations.c branches/soc-2010-leifandersen/source/blender/editors/transform/transform_snap.c branches/soc-2010-leifandersen/source/blender/editors/util/ed_util.c branches/soc-2010-leifandersen/source/blender/editors/util/editmode_undo.c branches/soc-2010-leifandersen/source/blender/editors/util/numinput.c branches/soc-2010-leifandersen/source/blender/editors/util/undo.c branches/soc-2010-leifandersen/source/blender/editors/uvedit/uvedit_draw.c branches/soc-2010-leifandersen/source/blender/editors/uvedit/uvedit_ops.c branches/soc-2010-leifandersen/source/blender/editors/uvedit/uvedit_unwrap_ops.c branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_buffers.c branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_codegen.c branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_draw.c branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_extensions.c branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_material.c branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_shader_material.glsl branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_shader_material.glsl.c branches/soc-2010-leifandersen/source/blender/imbuf/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/imbuf/IMB_imbuf_types.h branches/soc-2010-leifandersen/source/blender/imbuf/SConscript branches/soc-2010-leifandersen/source/blender/imbuf/intern/Makefile branches/soc-2010-leifandersen/source/blender/imbuf/intern/allocimbuf.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/filetype.c branches/soc-2010-leifandersen/source/blender/imbuf/intern/openexr/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/imbuf/intern/radiance_hdr.c branches/soc-2010-leifandersen/source/blender/imbuf/intern/thumbs.c branches/soc-2010-leifandersen/source/blender/imbuf/intern/util.c branches/soc-2010-leifandersen/source/blender/makesdna/DNA_ID.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_action_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_actuator_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_brush_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_constraint_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_curve_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_object_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_scene_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_sequence_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_sound_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_space_types.h branches/soc-2010-leifandersen/source/blender/makesdna/DNA_userdef_types.h branches/soc-2010-leifandersen/source/blender/makesdna/intern/makesdna.c branches/soc-2010-leifandersen/source/blender/makesrna/RNA_access.h branches/soc-2010-leifandersen/source/blender/makesrna/RNA_define.h branches/soc-2010-leifandersen/source/blender/makesrna/SConscript branches/soc-2010-leifandersen/source/blender/makesrna/intern/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/makesrna/intern/Makefile branches/soc-2010-leifandersen/source/blender/makesrna/intern/SConscript branches/soc-2010-leifandersen/source/blender/makesrna/intern/makesrna.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_access.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_action.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_actuator.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animation.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animviz.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_armature.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_boid.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_brush.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_cloth.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_color.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_constraint.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_context.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_curve.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_define.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fcurve.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_internal.h branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_internal_types.h branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_key.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_lamp.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_main.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_material.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_mesh.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_modifier.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_particle.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_pose.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_rna.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_screen.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sculpt_paint.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sensor.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sequencer.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_space.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_texture.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_ui.c branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_ui_api.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/makesrna/intern/rna_world.c branches/soc-2010-leifandersen/source/blender/modifiers/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_armature.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_array.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_boolean.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_cast.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_curve.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_displace.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_fluidsim.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_hook.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_lattice.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_mask.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_meshdeform.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_mirror.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_screw.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_shrinkwrap.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_simpledeform.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_smoke.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_uvproject.c branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_wave.c branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_value.c branches/soc-2010-leifandersen/source/blender/nodes/intern/SHD_nodes/SHD_value.c branches/soc-2010-leifandersen/source/blender/python/SConscript 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/mathutils.c branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_color.c branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_euler.c branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_matrix.c branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_quat.c branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_vector.c 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_rna.c branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna_callback.c branches/soc-2010-leifandersen/source/blender/quicktime/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/quicktime/apple/Makefile branches/soc-2010-leifandersen/source/blender/readblenfile/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/render/CMakeLists.txt branches/soc-2010-leifandersen/source/blender/render/intern/raytrace/Makefile branches/soc-2010-leifandersen/source/blender/render/intern/source/convertblender.c branches/soc-2010-leifandersen/source/blender/render/intern/source/pipeline.c branches/soc-2010-leifandersen/source/blender/render/intern/source/texture.c branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_draw.c branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_operators.c branches/soc-2010-leifandersen/source/blenderplayer/CMakeLists.txt branches/soc-2010-leifandersen/source/creator/CMakeLists.txt branches/soc-2010-leifandersen/source/creator/Makefile branches/soc-2010-leifandersen/source/creator/creator.c branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Converter/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Converter/KX_ConvertControllers.cpp branches/soc-2010-leifandersen/source/gameengine/Expressions/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/GameLogic/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/GameLogic/SCA_PythonController.cpp branches/soc-2010-leifandersen/source/gameengine/GamePlayer/common/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/GamePlayer/ghost/CMakeLists.txt 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_KetsjiEngine.h 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/Makefile branches/soc-2010-leifandersen/source/gameengine/Network/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Physics/Bullet/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Physics/Dummy/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Physics/common/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Rasterizer/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/SceneGraph/CMakeLists.txt branches/soc-2010-leifandersen/source/gameengine/VideoTexture/CMakeLists.txt branches/soc-2010-leifandersen/source/kernel/CMakeLists.txt Added Paths: ----------- branches/soc-2010-leifandersen/release/scripts/modules/bpy/path.py branches/soc-2010-leifandersen/release/scripts/modules/bpy_xml_ui.py branches/soc-2010-leifandersen/release/scripts/ui/properties_render_test.xml Removed Paths: ------------- branches/soc-2010-leifandersen/source/blender/makesdna/DNA_wave_types.h Modified: branches/soc-2010-leifandersen/CMakeLists.txt =================================================================== --- branches/soc-2010-leifandersen/CMakeLists.txt 2010-08-09 02:29:06 UTC (rev 31185) +++ branches/soc-2010-leifandersen/CMakeLists.txt 2010-08-09 03:02:20 UTC (rev 31186) @@ -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) @@ -220,7 +222,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 @@ -235,16 +237,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) @@ -323,8 +325,8 @@ SET(PLATFORM_LINKFLAGS "-pthread") # Better warnings - SET(C_WARNINGS "-Wall -Wextra -Winit-self -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-sign-compare -Wno-missing-field-initializers -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas") - SET(CXX_WARNINGS "-Wall -Wextra -Winit-self -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-sign-compare -Wno-missing-field-initializers -Wno-invalid-offsetof -Wno-sign-compare") + 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") INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) ENDIF(UNIX AND NOT APPLE) @@ -497,7 +499,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) @@ -509,14 +511,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) @@ -607,19 +609,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) @@ -727,12 +729,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) @@ -810,12 +812,12 @@ 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}") @@ -869,11 +871,11 @@ #----------------------------------------------------------------------------- # Common. -IF(WITH_OPENJPEG) +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-leifandersen/SConstruct =================================================================== --- branches/soc-2010-leifandersen/SConstruct 2010-08-09 02:29:06 UTC (rev 31185) +++ branches/soc-2010-leifandersen/SConstruct 2010-08-09 03:02:20 UTC (rev 31186) @@ -223,6 +223,8 @@ 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 Modified: branches/soc-2010-leifandersen/build_files/cmake/macros.cmake =================================================================== --- branches/soc-2010-leifandersen/build_files/cmake/macros.cmake 2010-08-09 02:29:06 UTC (rev 31185) +++ branches/soc-2010-leifandersen/build_files/cmake/macros.cmake 2010-08-09 03:02:20 UTC (rev 31186) @@ -58,12 +58,12 @@ IF(WITH_FFMPEG) LINK_DIRECTORIES(${FFMPEG_LIBPATH}) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) LINK_DIRECTORIES(${OPENEXR_LIBPATH}) - ENDIF(WITH_OPENEXR) - IF(WITH_TIFF) + ENDIF(WITH_IMAGE_OPENEXR) + IF(WITH_IMAGE_TIFF) LINK_DIRECTORIES(${TIFF_LIBPATH}) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_LCMS) LINK_DIRECTORIES(${LCMS_LIBPATH}) ENDIF(WITH_LCMS) @@ -140,10 +140,10 @@ IF(WITH_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) ENDIF(WITH_QUICKTIME) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) - ENDIF(WITH_TIFF) - IF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_TIFF) + IF(WITH_IMAGE_OPENEXR) IF(WIN32) FOREACH(loop_var ${OPENEXR_LIB}) TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) @@ -152,7 +152,7 @@ ELSE(WIN32) TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) ENDIF(WIN32) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_LCMS) TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) ENDIF(WITH_LCMS) Modified: branches/soc-2010-leifandersen/build_files/make/nan_compile.mk =================================================================== --- branches/soc-2010-leifandersen/build_files/make/nan_compile.mk 2010-08-09 02:29:06 UTC (rev 31185) +++ branches/soc-2010-leifandersen/build_files/make/nan_compile.mk 2010-08-09 03:02:20 UTC (rev 31186) @@ -89,7 +89,6 @@ CCFLAGS += -pipe -fPIC -funsigned-char endif - CFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS) CCFLAGS += -arch $(MACOSX_ARCHITECTURE) #-isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MACOSX_MIN_VERS) Modified: branches/soc-2010-leifandersen/build_files/make/nan_definitions.mk =================================================================== --- branches/soc-2010-leifandersen/build_files/make/nan_definitions.mk 2010-08-09 02:29:06 UTC (rev 31185) +++ branches/soc-2010-leifandersen/build_files/make/nan_definitions.mk 2010-08-09 03:02:20 UTC (rev 31186) @@ -159,6 +159,17 @@ endif export WITH_TIFF ?= true + + #enable raytracing optimization (currently only for i386 and x86_64) + ifeq ($(CPU),powerpc) + export WITH_BF_RAYOPTIMIZATION ?= false + else + export WITH_BF_RAYOPTIMIZATION ?= true + endif + + export WITH_LCMS ?= false + export WITH_CINEON ?= true + export WITH_HDR ?= true # Compare recreated .mo files with committed ones export BF_VERIFY_MO_FILES ?= true @@ -622,6 +633,11 @@ # default tiff libs export NAN_TIFF_LIBS ?= $(NAN_TIFF)/lib/libtiff.a + # default path to lcms, may be overidden in platform sections above or in user-def.mk + export BF_LCMS ?= $(LCGDIR)/lcms + export BF_LCMS_INC ?= $(BF_LCMS)/include + export BF_LCMS_LIBS ?= $(BF_LCMS)/lib/liblcms.a + endif # CONFIG_GUESS # Don't want to build the gameengine? Modified: branches/soc-2010-leifandersen/build_files/make/nan_link.mk =================================================================== --- branches/soc-2010-leifandersen/build_files/make/nan_link.mk 2010-08-09 02:29:06 UTC (rev 31185) +++ branches/soc-2010-leifandersen/build_files/make/nan_link.mk 2010-08-09 03:02:20 UTC (rev 31186) @@ -195,4 +195,8 @@ LLIBS += $(NAN_TIFF_LIBS) endif +ifeq ($(WITH_LCMS),true) + LLIBS += $(BF_LCMS_LIBS) +endif + LLIBS += $(NAN_PYTHON_LIB) Modified: branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py =================================================================== --- branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py 2010-08-09 02:29:06 UTC (rev 31185) @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs