[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40414] branches/cycles: Cycles: svn merge -r40358:40411 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Sep 20 20:48:29 CEST 2011
Revision: 40414
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40414
Author: blendix
Date: 2011-09-20 18:48:28 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Cycles: svn merge -r40358:40411 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40358
Modified Paths:
--------------
branches/cycles/GNUmakefile
branches/cycles/SConstruct
branches/cycles/build_files/cmake/cmake_static_check_splint.py
branches/cycles/build_files/scons/config/win64-vc-config.py
branches/cycles/build_files/scons/tools/Blender.py
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/extern/recastnavigation/CMakeLists.txt
branches/cycles/extern/recastnavigation/SConscript
branches/cycles/intern/smoke/CMakeLists.txt
branches/cycles/po/ar.po
branches/cycles/po/bg.po
branches/cycles/po/ca.po
branches/cycles/po/cs.po
branches/cycles/po/de.po
branches/cycles/po/el.po
branches/cycles/po/es.po
branches/cycles/po/fi.po
branches/cycles/po/fr.po
branches/cycles/po/hr.po
branches/cycles/po/it.po
branches/cycles/po/ja.po
branches/cycles/po/ko.po
branches/cycles/po/nl.po
branches/cycles/po/pl.po
branches/cycles/po/pt_BR.po
branches/cycles/po/ro.po
branches/cycles/po/ru.po
branches/cycles/po/sr.po
branches/cycles/po/sr at Latn.po
branches/cycles/po/sv.po
branches/cycles/po/uk.po
branches/cycles/po/zh_CN.po
branches/cycles/release/bin/.blender/.Blanguages
branches/cycles/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/cycles/release/scripts/startup/bl_ui/properties_animviz.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_armature.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_bone.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_camera.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_curve.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_empty.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/cycles/release/scripts/startup/bl_ui/properties_game.py
branches/cycles/release/scripts/startup/bl_ui/properties_material.py
branches/cycles/release/scripts/startup/bl_ui/properties_object.py
branches/cycles/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/cycles/release/scripts/startup/bl_ui/properties_particle.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_common.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_field.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/cycles/release/scripts/startup/bl_ui/properties_render.py
branches/cycles/release/scripts/startup/bl_ui/properties_scene.py
branches/cycles/release/scripts/startup/bl_ui/properties_texture.py
branches/cycles/release/scripts/startup/bl_ui/properties_world.py
branches/cycles/release/scripts/startup/bl_ui/space_console.py
branches/cycles/release/scripts/startup/bl_ui/space_dopesheet.py
branches/cycles/release/scripts/startup/bl_ui/space_graph.py
branches/cycles/release/scripts/startup/bl_ui/space_image.py
branches/cycles/release/scripts/startup/bl_ui/space_info.py
branches/cycles/release/scripts/startup/bl_ui/space_logic.py
branches/cycles/release/scripts/startup/bl_ui/space_nla.py
branches/cycles/release/scripts/startup/bl_ui/space_node.py
branches/cycles/release/scripts/startup/bl_ui/space_sequencer.py
branches/cycles/release/scripts/startup/bl_ui/space_text.py
branches/cycles/release/scripts/startup/bl_ui/space_time.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/source/blender/blenfont/BLF_api.h
branches/cycles/source/blender/blenfont/CMakeLists.txt
branches/cycles/source/blender/blenfont/SConscript
branches/cycles/source/blender/blenfont/intern/blf_lang.c
branches/cycles/source/blender/blenkernel/BKE_armature.h
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_image.h
branches/cycles/source/blender/blenkernel/BKE_material.h
branches/cycles/source/blender/blenkernel/BKE_mesh.h
branches/cycles/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/cycles/source/blender/blenkernel/BKE_paint.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/SConscript
branches/cycles/source/blender/blenkernel/intern/DerivedMesh.c
branches/cycles/source/blender/blenkernel/intern/anim_sys.c
branches/cycles/source/blender/blenkernel/intern/armature.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cycles/source/blender/blenkernel/intern/customdata.c
branches/cycles/source/blender/blenkernel/intern/image.c
branches/cycles/source/blender/blenkernel/intern/material.c
branches/cycles/source/blender/blenkernel/intern/mesh.c
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/blenkernel/intern/object.c
branches/cycles/source/blender/blenkernel/intern/paint.c
branches/cycles/source/blender/blenkernel/intern/sound.c
branches/cycles/source/blender/blenkernel/intern/subsurf_ccg.c
branches/cycles/source/blender/blenlib/BLI_fileops.h
branches/cycles/source/blender/blenlib/intern/fileops.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/collada/GeometryExporter.cpp
branches/cycles/source/blender/collada/GeometryExporter.h
branches/cycles/source/blender/collada/MeshImporter.cpp
branches/cycles/source/blender/collada/MeshImporter.h
branches/cycles/source/blender/editors/armature/CMakeLists.txt
branches/cycles/source/blender/editors/armature/SConscript
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/meshlaplacian.c
branches/cycles/source/blender/editors/armature/poselib.c
branches/cycles/source/blender/editors/include/ED_mesh.h
branches/cycles/source/blender/editors/include/ED_view3d.h
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_layout.c
branches/cycles/source/blender/editors/interface/interface_panel.c
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_style.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/interface_utils.c
branches/cycles/source/blender/editors/interface/view2d.c
branches/cycles/source/blender/editors/interface/view2d_ops.c
branches/cycles/source/blender/editors/mesh/editmesh.c
branches/cycles/source/blender/editors/mesh/editmesh_mods.c
branches/cycles/source/blender/editors/mesh/mesh_data.c
branches/cycles/source/blender/editors/mesh/meshtools.c
branches/cycles/source/blender/editors/object/object_intern.h
branches/cycles/source/blender/editors/object/object_ops.c
branches/cycles/source/blender/editors/object/object_vgroup.c
branches/cycles/source/blender/editors/screen/area.c
branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
branches/cycles/source/blender/editors/sculpt_paint/paint_intern.h
branches/cycles/source/blender/editors/sculpt_paint/paint_ops.c
branches/cycles/source/blender/editors/sculpt_paint/paint_utils.c
branches/cycles/source/blender/editors/sculpt_paint/paint_vertex.c
branches/cycles/source/blender/editors/sound/sound_ops.c
branches/cycles/source/blender/editors/space_action/action_select.c
branches/cycles/source/blender/editors/space_buttons/CMakeLists.txt
branches/cycles/source/blender/editors/space_buttons/SConscript
branches/cycles/source/blender/editors/space_buttons/buttons_header.c
branches/cycles/source/blender/editors/space_file/file_draw.c
branches/cycles/source/blender/editors/space_file/file_panels.c
branches/cycles/source/blender/editors/space_file/filesel.c
branches/cycles/source/blender/editors/space_graph/CMakeLists.txt
branches/cycles/source/blender/editors/space_graph/SConscript
branches/cycles/source/blender/editors/space_graph/graph_buttons.c
branches/cycles/source/blender/editors/space_image/space_image.c
branches/cycles/source/blender/editors/space_info/space_info.c
branches/cycles/source/blender/editors/space_logic/CMakeLists.txt
branches/cycles/source/blender/editors/space_logic/logic_ops.c
branches/cycles/source/blender/editors/space_logic/logic_window.c
branches/cycles/source/blender/editors/space_nla/CMakeLists.txt
branches/cycles/source/blender/editors/space_nla/SConscript
branches/cycles/source/blender/editors/space_nla/nla_buttons.c
branches/cycles/source/blender/editors/space_nla/nla_select.c
branches/cycles/source/blender/editors/space_node/drawnode.c
branches/cycles/source/blender/editors/space_node/node_draw.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/node_header.c
branches/cycles/source/blender/editors/space_node/node_select.c
branches/cycles/source/blender/editors/space_node/node_state.c
branches/cycles/source/blender/editors/space_outliner/outliner_edit.c
branches/cycles/source/blender/editors/space_outliner/outliner_tree.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_text/text_draw.c
branches/cycles/source/blender/editors/space_view3d/drawmesh.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/drawvolume.c
branches/cycles/source/blender/editors/space_view3d/space_view3d.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_header.c
branches/cycles/source/blender/editors/space_view3d/view3d_select.c
branches/cycles/source/blender/editors/space_view3d/view3d_toolbar.c
branches/cycles/source/blender/editors/space_view3d/view3d_view.c
branches/cycles/source/blender/editors/transform/CMakeLists.txt
branches/cycles/source/blender/editors/transform/SConscript
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_manipulator.c
branches/cycles/source/blender/editors/transform/transform_ops.c
branches/cycles/source/blender/editors/transform/transform_orientations.c
branches/cycles/source/blender/editors/uvedit/uvedit_ops.c
branches/cycles/source/blender/gpu/GPU_draw.h
branches/cycles/source/blender/gpu/GPU_material.h
branches/cycles/source/blender/gpu/intern/gpu_draw.c
branches/cycles/source/blender/gpu/intern/gpu_material.c
branches/cycles/source/blender/imbuf/SConscript
branches/cycles/source/blender/makesdna/DNA_material_types.h
branches/cycles/source/blender/makesdna/DNA_mesh_types.h
branches/cycles/source/blender/makesdna/DNA_meshdata_types.h
branches/cycles/source/blender/makesdna/DNA_modifier_types.h
branches/cycles/source/blender/makesdna/DNA_object_types.h
branches/cycles/source/blender/makesdna/DNA_scene_types.h
branches/cycles/source/blender/makesdna/DNA_userdef_types.h
branches/cycles/source/blender/makesrna/RNA_access.h
branches/cycles/source/blender/makesrna/SConscript
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/SConscript
branches/cycles/source/blender/makesrna/intern/rna_access.c
branches/cycles/source/blender/makesrna/intern/rna_curve.c
branches/cycles/source/blender/makesrna/intern/rna_material.c
branches/cycles/source/blender/makesrna/intern/rna_mesh.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
branches/cycles/source/blender/makesrna/intern/rna_object.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_userdef.c
branches/cycles/source/blender/modifiers/CMakeLists.txt
branches/cycles/source/blender/modifiers/SConscript
branches/cycles/source/blender/modifiers/intern/MOD_uvproject.c
branches/cycles/source/blender/nodes/composite/node_composite_util.h
branches/cycles/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/cycles/source/blender/nodes/intern/node_common.c
branches/cycles/source/blender/python/SConscript
branches/cycles/source/blender/python/generic/CMakeLists.txt
branches/cycles/source/blender/python/generic/blf_py_api.c
branches/cycles/source/blender/python/intern/CMakeLists.txt
branches/cycles/source/blender/python/intern/bpy.h
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/python/mathutils/mathutils_Euler.c
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.c
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cycles/source/blender/python/mathutils/mathutils_Vector.c
branches/cycles/source/blender/render/intern/source/convertblender.c
branches/cycles/source/blender/render/intern/source/pixelshading.c
branches/cycles/source/blender/render/intern/source/pointdensity.c
branches/cycles/source/blender/render/intern/source/render_texture.c
branches/cycles/source/blender/render/intern/source/rendercore.c
branches/cycles/source/blender/render/intern/source/shadeoutput.c
branches/cycles/source/blender/render/intern/source/zbuf.c
branches/cycles/source/blender/windowmanager/SConscript
branches/cycles/source/blender/windowmanager/WM_api.h
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_files.c
branches/cycles/source/blender/windowmanager/intern/wm_gesture.c
branches/cycles/source/blender/windowmanager/intern/wm_init_exit.c
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/blender/windowmanager/intern/wm_window.c
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cycles/source/gameengine/GamePlayer/ghost/SConscript
branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.h
branches/cycles/source/gameengine/Ketsji/BL_Material.cpp
branches/cycles/source/gameengine/Ketsji/BL_Material.h
branches/cycles/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/cycles/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/cycles/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/cycles/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/cycles/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/cycles/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/cycles/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
Added Paths:
-----------
branches/cycles/extern/recastnavigation/recast-capi.cpp
branches/cycles/extern/recastnavigation/recast-capi.h
branches/cycles/po/POTFILES.in
branches/cycles/po/blender.pot
branches/cycles/po/messages.txt
branches/cycles/po/ne.po
branches/cycles/po/update_mo.py
branches/cycles/po/update_msg.py
branches/cycles/po/update_po.py
branches/cycles/po/update_pot.py
branches/cycles/po/zh_TW.po
branches/cycles/release/bin/.blender/fonts/
branches/cycles/release/bin/.blender/fonts/droidsans.ttf.gz
branches/cycles/release/bin/.blender/locale/ne/
branches/cycles/release/bin/.blender/locale/ne/LC_MESSAGES/
branches/cycles/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/zh_TW/
branches/cycles/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
branches/cycles/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
branches/cycles/source/blender/blenfont/BLF_translation.h
branches/cycles/source/blender/blenfont/intern/blf_translation.c
branches/cycles/source/blender/blenkernel/intern/navmesh_conversion.c
branches/cycles/source/blender/modifiers/intern/MOD_navmesh.c
branches/cycles/source/blender/python/intern/bpy_interface_atexit.c
Removed Paths:
-------------
branches/cycles/release/bin/.blender/fonts/droidsans.ttf.gz
branches/cycles/release/bin/.blender/locale/ne/LC_MESSAGES/
branches/cycles/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/zh_TW/LC_MESSAGES/
branches/cycles/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
branches/cycles/source/blender/blenkernel/intern/navmesh_conversion.cpp
branches/cycles/source/blender/modifiers/intern/MOD_navmesh.cpp
Property Changed:
----------------
branches/cycles/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40358
+ /trunk:37695-37700
/trunk/blender:36353-40411
Modified: branches/cycles/GNUmakefile
===================================================================
--- branches/cycles/GNUmakefile 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/GNUmakefile 2011-09-20 18:48:28 UTC (rev 40414)
@@ -36,7 +36,7 @@
BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=""
+BUILD_CMAKE_ARGS:=
# -----------------------------------------------------------------------------
@@ -77,14 +77,24 @@
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
+
# -----------------------------------------------------------------------------
+# Macro for configuring cmake
+
+CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
+ -H$(BLENDER_DIR) \
+ -B$(BUILD_DIR) \
+ -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
+
+
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
+ $(CMAKE_CONFIG); \
fi
@echo
@@ -120,6 +130,10 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
+ @echo "Other Targets"
+ @echo " * translations - update blenders translation files in po/"
+ # TODO, doxygen and sphinx docs
+ @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -147,6 +161,16 @@
# -----------------------------------------------------------------------------
+# Other Targets
+#
+translations:
+ $(BUILD_DIR)/bin/blender --background --python po/update_msg.py
+ python3 po/update_pot.py
+ python3 po/update_po.py
+ python3 po/update_mo.py
+
+
+# -----------------------------------------------------------------------------
# Tests
#
test:
@@ -186,12 +210,15 @@
#
check_cppcheck:
+ $(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
check_splint:
+ $(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
check_sparse:
+ $(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
Modified: branches/cycles/SConstruct
===================================================================
--- branches/cycles/SConstruct 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/SConstruct 2011-09-20 18:48:28 UTC (rev 40414)
@@ -512,31 +512,35 @@
dottargetlist = []
scriptinstall = []
-if env['OURPLATFORM']!='darwin':
- for dp, dn, df in os.walk('bin/.blender'):
+if env['OURPLATFORM']!='darwin':
+ for dp, dn, df in os.walk('release/bin/.blender'):
+ dp = os.path.normpath(dp)
+
if '.svn' in dn:
dn.remove('.svn')
if '_svn' in dn:
dn.remove('_svn')
for f in df:
+ # This files aren't used anymore
+ if f in ['.Blanguages', '.bfont.ttf']:
+ continue
+
if not env['WITH_BF_INTERNATIONAL']:
if 'locale' in dp:
continue
- if f == '.Blanguages':
- continue
if not env['WITH_BF_FREETYPE']:
if f.endswith('.ttf'):
continue
- if 'locale' in dp:
+ if 'locale' in dp or 'fonts' in dp:
datafileslist.append(os.path.join(dp,f))
- dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[1:])) # skip bin
+ dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[3:])) # skip bin
datafilestargetlist.append(dir + os.sep + f)
else:
dotblendlist.append(os.path.join(dp, f))
- dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[1:])) # skip bin
+ dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[3:])) # skip bin
dottargetlist.append(dir + os.sep + f)
dotblenderinstall = []
Modified: branches/cycles/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- branches/cycles/build_files/cmake/cmake_static_check_splint.py 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/build_files/cmake/cmake_static_check_splint.py 2011-09-20 18:48:28 UTC (rev 40414)
@@ -58,6 +58,10 @@
# re-definitions, rna causes most of these
"-redef",
"-syntax",
+
+ # dummy, witjout this splint complains with:
+ # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
+ "-D_PC_MAX_CANON=0",
]
Modified: branches/cycles/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/cycles/build_files/scons/config/win64-vc-config.py 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/build_files/scons/config/win64-vc-config.py 2011-09-20 18:48:28 UTC (rev 40414)
@@ -96,7 +96,7 @@
BF_ZLIB_LIB = 'libz'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-WITH_BF_INTERNATIONAL = False
+WITH_BF_INTERNATIONAL = True
BF_GETTEXT = LIBDIR + '/gettext'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
@@ -188,11 +188,6 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-if BF_DEBUG:
- BF_NUMJOBS=1
-else:
- BF_NUMJOBS=6
-
PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
Modified: branches/cycles/build_files/scons/tools/Blender.py
===================================================================
--- branches/cycles/build_files/scons/tools/Blender.py 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/build_files/scons/tools/Blender.py 2011-09-20 18:48:28 UTC (rev 40414)
@@ -564,12 +564,12 @@
# print cmd
commands.getoutput(cmd)
cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
- shutil.copy(bldroot + '/release/bin/.blender/.bfont.ttf', cmd)
- shutil.copy(bldroot + '/release/bin/.blender/.Blanguages', cmd)
- cmd = 'cp -R %s/release/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
+ cmd = 'cp -R %s/release/bin/.blender/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
+ cmd = 'cp -R %s/release/bin/.blender/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+ commands.getoutput(cmd)
cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
commands.getoutput(cmd)
if env['WITH_OSX_STATICPYTHON']:
@@ -581,10 +581,6 @@
if binary == 'blender':#not copy everything for blenderplayer
cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/ui %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
- commands.getoutput(cmd)
- cmd = 'cp -R %s/release/io %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
- commands.getoutput(cmd)
cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
commands.getoutput(cmd)
Modified: branches/cycles/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/cycles/doc/python_api/sphinx_doc_gen.py 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/doc/python_api/sphinx_doc_gen.py 2011-09-20 18:48:28 UTC (rev 40414)
@@ -1036,8 +1036,12 @@
fw("copyright = u'Blender Foundation'\n")
fw("version = '%s - API'\n" % version_string)
fw("release = '%s - API'\n" % version_string)
- fw("html_theme = 'blender-org'\n")
- fw("html_theme_path = ['../']\n")
+
+ # until we get a theme for 'Naiad'
+ if 0:
+ fw("html_theme = 'blender-org'\n")
+ fw("html_theme_path = ['../']\n")
+
fw("html_favicon = 'favicon.ico'\n")
# not helpful since the source us generated, adds to upload size.
fw("html_copy_source = False\n")
Modified: branches/cycles/extern/recastnavigation/CMakeLists.txt
===================================================================
--- branches/cycles/extern/recastnavigation/CMakeLists.txt 2011-09-20 18:29:19 UTC (rev 40413)
+++ branches/cycles/extern/recastnavigation/CMakeLists.txt 2011-09-20 18:48:28 UTC (rev 40414)
@@ -25,7 +25,7 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- Recast/Include
+ Recast/Include
Detour/Include
)
@@ -34,6 +34,10 @@
)
set(SRC
+ recast-capi.cpp
+ recast-capi.h
+
+
Detour/Source/DetourCommon.cpp
Detour/Source/DetourNode.cpp
Detour/Source/DetourStatNavMesh.cpp
@@ -47,7 +51,7 @@
Detour/Include/DetourStatNavMeshBuilder.h
Detour/Include/DetourTileNavMesh.h
Detour/Include/DetourTileNavMeshBuilder.h
-
+
Recast/Source/Recast.cpp
Recast/Source/RecastContour.cpp
Recast/Source/RecastFilter.cpp
@@ -57,10 +61,10 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list