[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29998] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 29994.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Mon Jul 5 20:37:29 CEST 2010


Revision: 29998
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29998
Author:   kjym3
Date:     2010-07-05 20:37:29 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 29994.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29994

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMake/macros.cmake
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/config/darwin-config.py
    branches/soc-2008-mxcurioni/doc/blender.1
    branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/Makefile
    branches/soc-2008-mxcurioni/release/scripts/io/engine_render_pov.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
    branches/soc-2008-mxcurioni/release/scripts/io/import_scene_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
    branches/soc-2008-mxcurioni/release/scripts/op/object.py
    branches/soc-2008-mxcurioni/release/scripts/op/object_align.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/op/wm.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_logic.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mball.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_scene.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_bfile.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_deps.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.h
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_render.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_freestyle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.sh
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/texture.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_files.h
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/tools/Blender.py
    branches/soc-2008-mxcurioni/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/doc/blender.1.py
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Path-api.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/
    branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2008-mxcurioni/source/blender/python/doc/examples/bpy.data.py

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_cleaner.py

Modified: branches/soc-2008-mxcurioni/CMake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/CMake/macros.cmake	2010-07-05 17:57:30 UTC (rev 29997)
+++ branches/soc-2008-mxcurioni/CMake/macros.cmake	2010-07-05 18:37:29 UTC (rev 29998)
@@ -181,3 +181,20 @@
 		TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
 	ENDIF(WIN32)
 ENDMACRO(SETUP_LIBLINKS)
+
+MACRO(TEST_SSE_SUPPORT)
+	INCLUDE(CheckCXXSourceCompiles)
+
+	MESSAGE(STATUS "Detecting SSE support")
+	IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+		SET(CMAKE_REQUIRED_FLAGS "-msse -msse2")
+	ELSEIF(MSVC)
+		SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2")
+	ENDIF()
+
+	CHECK_CXX_SOURCE_COMPILES("
+		#include <xmmintrin.h>
+		int main() { __m128 v = _mm_setzero_ps(); return 0; }"
+	SUPPORT_SSE_BUILD)
+ENDMACRO(TEST_SSE_SUPPORT)
+

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-07-05 17:57:30 UTC (rev 29997)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-07-05 18:37:29 UTC (rev 29998)
@@ -60,6 +60,10 @@
 SET(BLENDER_VERSION  2.5)
 
 #-----------------------------------------------------------------------------
+# Load some macros.
+INCLUDE(CMake/macros.cmake)
+
+#-----------------------------------------------------------------------------
 # Set default config options
 
 # Blender internal features
@@ -114,7 +118,7 @@
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
-IF (APPLE)
+IF(APPLE)
 	OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	OPTION(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	OPTION(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
@@ -128,6 +132,8 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+TEST_SSE_SUPPORT()
+
 # disabled for now, not supported
 # OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 
@@ -140,10 +146,6 @@
 # When changing any of this remember to update the notes in doc/blender-cmake.txt
 
 #-----------------------------------------------------------------------------
-# Load some macros.
-INCLUDE(CMake/macros.cmake)
-
-#-----------------------------------------------------------------------------
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
@@ -228,6 +230,10 @@
 			/opt/include/OpenEXR
 		)
 		SET(OPENEXR_LIB Half IlmImf Iex Imath)
+		
+		IF(NOT OPENEXR_INC)
+			SET(WITH_OPENEXR OFF)
+		ENDIF(NOT OPENEXR_INC)
 	ENDIF(WITH_OPENEXR)
 
 	IF(WITH_TIFF)
@@ -304,6 +310,12 @@
 
 	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)
+
 	SET(PLATFORM_LINKFLAGS "-pthread")
 
 	# Better warnings
@@ -388,6 +400,11 @@
 		SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
 	ENDIF(WITH_QUICKTIME)
 
+	IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+		ADD_DEFINITIONS(-D__SSE__)
+		ADD_DEFINITIONS(-D__MMX__)
+	ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
 	IF(MSVC)
 		IF(CMAKE_CL_64)
 			SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -707,7 +724,12 @@
 		SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 	ENDIF(WITH_OPENEXR)
 
-    # TODO: IF(WITH_LCMS)
+	IF(WITH_LCMS)
+		SET(LCMS ${LIBDIR}/lcms)
+		SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+		SET(LCMS_LIBRARY lcms)
+		SET(LCMS_LIBPATH ${LCMS}/lib)
+	ENDIF(WITH_LCMS)
 
 	IF(WITH_FFMPEG)
 		SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -784,6 +806,12 @@
 		SET(TIFF_LIBPATH ${TIFF}/lib)
 	ENDIF(WITH_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)
+
 	SET(EXETYPE MACOSX_BUNDLE)
 
 	SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2010-07-05 17:57:30 UTC (rev 29997)
+++ branches/soc-2008-mxcurioni/SConstruct	2010-07-05 18:37:29 UTC (rev 29998)
@@ -56,6 +56,8 @@
 btools = tools.btools
 B = tools.Blender
 
+VERSION = tools.btools.VERSION # This is used in creating the local config directories
+
 ### globals ###
 platform = sys.platform
 quickie = None
@@ -193,7 +195,7 @@
 # NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
 # TODO: perhaps we need an option (off by default) to not do this altogether...
 if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
-	scriptsDir = env['BF_INSTALLDIR'] + os.sep + '.blender' + os.sep + 'scripts'
+	scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
 	if os.path.isdir(scriptsDir):
 		print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
 		shutil.rmtree(scriptsDir)
@@ -434,9 +436,11 @@
 	
 	blenderinstall = env.Install(dir=dir, source=B.program_list)
 
-#-- .blender
-#- dont do .blender and scripts for darwin, it is already in the bundle
+#-- local path = config files in install dir: installdir\VERSION
+#- dont do config and scripts for darwin, it is already in the bundle
 dotblendlist = []
+datafileslist = []
+datafilestargetlist = []
 dottargetlist = []
 scriptinstall = []
 
@@ -455,20 +459,29 @@
 					if f.endswith('.ttf'):
 						continue
 				
-				dotblendlist.append(os.path.join(dp, f))
-				if env['WITH_BF_FHS']:	dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[2:]))	# skip bin/.blender
-				else:					dir= os.path.join(*([BLENDERPATH] + dp.split(os.sep)[1:]))	# skip bin
-				
-				dottargetlist.append(dir + os.sep + f)
+				if 'locale' in dp:
+					datafileslist.append(os.path.join(dp,f))
+					if env['WITH_BF_FHS']:	dir= os.path.join(*([BLENDERPATH] + ['datafiles'] + dp.split(os.sep)[2:]))	# skip bin/.blender
+					else:					dir= os.path.join(*([BLENDERPATH] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:]))	# skip bin
+					datafilestargetlist.append(dir + os.sep + f)
+
+				else:
+					dotblendlist.append(os.path.join(dp, f))
+					if env['WITH_BF_FHS']:	dir= os.path.join(*([BLENDERPATH] + ['config'] + dp.split(os.sep)[2:]))	# skip bin/.blender
+					else:					dir= os.path.join(*([BLENDERPATH] + [VERSION] + ['config'] + dp.split(os.sep)[1:]))	# skip bin
 					
-
+					dottargetlist.append(dir + os.sep + f)
+					
 		dotblenderinstall = []
 		for targetdir,srcfile in zip(dottargetlist, dotblendlist):
 			td, tf = os.path.split(targetdir)
 			dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+		for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
+			td, tf = os.path.split(targetdir)
+			dotblenderinstall.append(env.Install(dir=td, source=srcfile))
 		
 		if env['WITH_BF_PYTHON']:
-			#-- .blender/scripts
+			#-- local/VERSION/scripts
 			scriptpaths=['release/scripts']
 			for scriptpath in scriptpaths:
 				for dp, dn, df in os.walk(scriptpath):
@@ -476,7 +489,7 @@
 						dn.remove('.svn')
 					
 					if env['WITH_BF_FHS']:		dir = BLENDERPATH
-					else:						dir = os.path.join(env['BF_INSTALLDIR'], '.blender')				
+					else:						dir = os.path.join(env['BF_INSTALLDIR'], VERSION)				
 					dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
 					
 					source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']

Modified: branches/soc-2008-mxcurioni/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/darwin-config.py	2010-07-05 17:57:30 UTC (rev 29997)
+++ branches/soc-2008-mxcurioni/config/darwin-config.py	2010-07-05 18:37:29 UTC (rev 29998)
@@ -151,6 +151,13 @@
 
 WITH_BF_DDS = True
 
+#Color Management System
+WITH_BF_LCMS = False
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
 WITH_BF_JPEG = True
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'

Modified: branches/soc-2008-mxcurioni/doc/blender.1
===================================================================
(Binary files differ)

Copied: branches/soc-2008-mxcurioni/doc/blender.1.py (from rev 29994, trunk/blender/doc/blender.1.py)
===================================================================
--- branches/soc-2008-mxcurioni/doc/blender.1.py	                        (rev 0)
+++ branches/soc-2008-mxcurioni/doc/blender.1.py	2010-07-05 18:37:29 UTC (rev 29998)
@@ -0,0 +1,134 @@
+#!/usr/bin/python
+
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+import subprocess
+import os
+
+import time
+import datetime
+
+
+def man_format(data):
+    data = data.replace("-", "\\-")
+    data = data.replace("\t", "    ")
+    # data = data.replace("$", "\\fI")
+    
+    data_ls = []
+    for w in data.split():
+        if w.startswith("$"):
+            w = "\\fI" + w[1:] + "\\fR"
+           
+        data_ls.append(w)
+
+    data = data[:len(data) - len(data.lstrip())] + " ".join(data_ls)
+
+    return data
+
+
+blender_bin = os.path.join(os.path.dirname(__file__), "../blender")
+
+blender_help = subprocess.Popen([blender_bin, "--help"], stdout=subprocess.PIPE).communicate()[0].decode()
+
+blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode().strip()

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list