[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34673] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 34670.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Feb 6 19:05:25 CET 2011
Revision: 34673
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34673
Author: kjym3
Date: 2011-02-06 18:05:05 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34670.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34670
Modified Paths:
--------------
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.Vector.py
branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.sh
branches/soc-2008-mxcurioni/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/tools/bpy_introspect_ui.py
branches/soc-2008-mxcurioni/intern/tools/dump_rna2xml.py
branches/soc-2008-mxcurioni/release/bin/blender-thumbnailer.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/operators.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/op/fcurve_euler_filter.py
branches/soc-2008-mxcurioni/release/scripts/op/nla.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/DVD.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/SVCD.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/VCD.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/h264.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/theora.py
branches/soc-2008-mxcurioni/release/scripts/presets/ffmpeg/xvid.py
branches/soc-2008-mxcurioni/release/scripts/presets/sss/apple.py
branches/soc-2008-mxcurioni/release/scripts/templates/background_job.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.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/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.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/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.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/collada/DocumentImporter.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sculpt.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.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_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.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/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_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/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_view.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/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_none.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
branches/soc-2008-mxcurioni/source/blender/python/rna_dump.py
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/raycounter.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/rayobject.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/rendercore.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/volumetric.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_hint.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.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/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/tests/pep8.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/source/blender/render/intern/include/rayintersection.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_empty.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_internal.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_raycounter.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/tests/batch_import.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_blibvh.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_instance.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_octree.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_raycounter.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-34574
+ /trunk/blender:34011-34670
Copied: branches/soc-2008-mxcurioni/GNUmakefile (from rev 34670, trunk/blender/GNUmakefile)
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile (rev 0)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2011-02-06 18:05:05 UTC (rev 34673)
@@ -0,0 +1,73 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
+# $Id$
+#
+# ##### 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 #####
+
+# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# eg:
+# ../build/Linux_i386
+# This is for users who like to configure & build blender with a single command.
+
+
+# System Vars
+OS:=$(shell uname -s)
+CPU:=$(shell uname -m)
+
+
+# Source and Build DIR's
+BLENDER_DIR:=$(shell pwd -P)
+BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS)_$(CPU)
+
+
+# Get the number of cores for threaded build
+NPROCS:=1
+ifeq ($(OS), Linux)
+ NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+endif
+ifeq ($(OS), Darwin)
+ NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print $4}{next;}')
+endif
+ifeq ($(OS), FreeBSD)
+ NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
+endif
+ifeq ($(OS), NetBSD)
+ NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
+endif
+
+
+# Build Blender
+all:
+ @echo
+ @echo Configuring Blender ...
+
+ if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+ mkdir -p $(BUILD_DIR) ; \
+ cd $(BUILD_DIR) ; \
+ cmake $(BLENDER_DIR) ; \
+ fi
+
+ @echo
+ @echo Building Blender ...
+ cd $(BUILD_DIR) ; make -s -j $(NPROCS)
+ @echo
+ @echo run blender from "$(BUILD_DIR)/bin/blender"
+ @echo
+
+.PHONY: all
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py 2011-02-06 17:36:42 UTC (rev 34672)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py 2011-02-06 18:05:05 UTC (rev 34673)
@@ -21,6 +21,8 @@
#
# ***** END GPL LICENSE BLOCK *****
+# <pep8 compliant>
+
IGNORE = \
"/test/",\
"/decimate_glut_test/",\
@@ -45,6 +47,8 @@
import os
from os.path import splitext
+
+
def source_list(path, filename_check=None):
for dirpath, dirnames, filenames in os.walk(path):
@@ -56,31 +60,37 @@
if filename_check is None or filename_check(filename):
yield os.path.join(dirpath, filename)
+
# extension checking
def is_c_header(filename):
ext = splitext(filename)[1]
return (ext in (".h", ".hpp", ".hxx"))
+
def is_cmake(filename):
ext = splitext(filename)[1]
return (ext == ".cmake") or (filename == "CMakeLists.txt")
+
def is_c_header(filename):
ext = splitext(filename)[1]
return (ext in (".h", ".hpp", ".hxx"))
+
def is_c(filename):
ext = splitext(filename)[1]
return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+
def is_c_any(filename):
return is_c(filename) or is_c_header(filename)
+
def cmake_get_src(f):
-
+
sources_h = []
sources_c = []
-
+
filen = open(f, "r", encoding="utf8")
it = iter(filen)
found = False
@@ -101,7 +111,7 @@
raise Exception("strict formatting not kept 'set(SRC*' %s:%d" % (f, i))
found = True
break
-
+
if "list(APPEND SRC" in l:
if l.endswith(")"):
raise Exception("strict formatting not kept 'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
@@ -118,11 +128,11 @@
except StopIteration:
it = None
break
-
+
l = l.strip()
if not l.startswith("#"):
-
+
if ")" in l:
if l.strip() != ")":
raise Exception("strict formatting not kept '*)' %s:%d" % (f, i))
@@ -130,7 +140,6 @@
# replace dirs
l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
-
if not l:
pass
@@ -140,7 +149,7 @@
raise Exception("Multi-line define '%s' %s:%d" % (l, f, i))
else:
new_file = normpath(join(cmake_base, l))
-
+
if is_c_header(new_file):
sources_h.append(new_file)
elif is_c(new_file):
@@ -168,19 +177,20 @@
if ff not in sources_c:
print(" missing: " + ff)
'''
-
+
filen.close()
for cmake in source_list(base, is_cmake):
cmake_get_src(cmake)
+
def is_ignore(f):
for ig in IGNORE:
if ig in f:
return True
return False
-
+
# First do stupid check, do these files exist?
for f in (global_h | global_c):
if f.endswith("dna.c"):
@@ -189,7 +199,7 @@
if not os.path.exists(f):
raise Exception("CMake referenced file missing: " + f)
-
+
# now check on files not accounted for.
print("\nC/C++ Files CMake doesnt know about...")
for cf in sorted(source_list(base, is_c)):
Modified: branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py 2011-02-06 17:36:42 UTC (rev 34672)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_qtcreator_project.py 2011-02-06 18:05:05 UTC (rev 34673)
@@ -21,6 +21,8 @@
#
# ***** END GPL LICENSE BLOCK *****
+# <pep8 compliant>
+
import os
from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
@@ -28,6 +30,7 @@
base = normpath(base)
base = abspath(base)
+
def source_list(path, filename_check=None):
for dirpath, dirnames, filenames in os.walk(path):
@@ -40,33 +43,40 @@
if filename_check is None or filename_check(filepath):
yield filepath
+
# extension checking
def is_c_header(filename):
ext = splitext(filename)[1]
return (ext in (".h", ".hpp", ".hxx"))
+
def is_cmake(filename):
ext = splitext(filename)[1]
return (ext == ".cmake") or (filename == "CMakeLists.txt")
+
def is_c_header(filename):
ext = splitext(filename)[1]
return (ext in (".h", ".hpp", ".hxx"))
+
def is_c(filename):
ext = splitext(filename)[1]
return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+
def is_c_any(filename):
return is_c(filename) or is_c_header(filename)
+
def is_svn_file(filename):
- dn, fn = os.path.split(filename)
- filename_svn = join(dn, ".svn", "text-base", "%s.svn-base" % fn)
- return exists(filename_svn)
+ dn, fn = os.path.split(filename)
+ filename_svn = join(dn, ".svn", "text-base", "%s.svn-base" % fn)
+ return exists(filename_svn)
+
def is_project_file(filename):
- return (is_c_any(filename) or is_cmake(filename)) and is_svn_file(filename)
+ return (is_c_any(filename) or is_cmake(filename)) and is_svn_file(filename)
files = list(source_list(base, filename_check=is_project_file))
files_rel = [relpath(f, start=base) for f in files]
@@ -87,8 +97,8 @@
qtc_cfg = join(base, "%s.config" % PROJECT_NAME)
if not exists(qtc_cfg):
- f = open(qtc_cfg, 'w')
- f.write("// ADD PREDEFINED MACROS HERE!\n")
+ f = open(qtc_cfg, 'w')
+ f.write("// ADD PREDEFINED MACROS HERE!\n")
print("Project file written to: %s" % qtc_prj)
# --- end
Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.Vector.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.Vector.py 2011-02-06 17:36:42 UTC (rev 34672)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.Vector.py 2011-02-06 18:05:05 UTC (rev 34673)
@@ -10,7 +10,7 @@
vec2d = mathutils.Vector((1, 2))
vec3d = mathutils.Vector((1, 0, 0))
-vec4d = vec_a.copy().resize4D()
+vec4d = vec_a.to_4d()
# other mathutuls types
quat = mathutils.Quaternion()
Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.py 2011-02-06 17:36:42 UTC (rev 34672)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/mathutils.py 2011-02-06 18:05:05 UTC (rev 34673)
@@ -3,15 +3,15 @@
vec = mathutils.Vector((1.0, 2.0, 3.0))
-mat_rot = mathutils.Matrix.Rotation(radians(90), 4, 'X')
+mat_rot = mathutils.Matrix.Rotation(radians(90.0), 4, 'X')
mat_trans = mathutils.Matrix.Translation(vec)
mat = mat_trans * mat_rot
mat.invert()
-mat3 = mat.rotation_part()
-quat1 = mat.to_quat()
-quat2 = mat3.to_quat()
+mat3 = mat.to_3x3()
+quat1 = mat.to_quaternion()
+quat2 = mat3.to_quaternion()
angle = quat1.difference(quat2)
Modified: branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py 2011-02-06 17:36:42 UTC (rev 34672)
+++ branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py 2011-02-06 18:05:05 UTC (rev 34673)
@@ -18,6 +18,8 @@
#
# #**** END GPL LICENSE BLOCK #****
+# <pep8 compliant>
+
script_help_msg = '''
Usage:
@@ -31,11 +33,11 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list