[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30836] branches/soc-2010-jwilkins: Merge with trunk: 30741-30831
Jason Wilkins
Jason.A.Wilkins at gmail.com
Wed Jul 28 14:31:32 CEST 2010
Revision: 30836
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30836
Author: jwilkins
Date: 2010-07-28 14:31:31 +0200 (Wed, 28 Jul 2010)
Log Message:
-----------
Merge with trunk: 30741-30831
Mistakenly forgot to commit the merge before adding the following feature:
== Wrap Texture Mode ==
Texture map coordinates are local to the brush instead of projected from the screen.
Modified Paths:
--------------
branches/soc-2010-jwilkins/CMakeLists.txt
branches/soc-2010-jwilkins/Makefile
branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py
branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_IReader.h
branches/soc-2010-jwilkins/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2010-jwilkins/intern/smoke/extern/smoke_API.h
branches/soc-2010-jwilkins/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2010-jwilkins/intern/smoke/intern/FLUID_3D.h
branches/soc-2010-jwilkins/intern/smoke/intern/smoke_API.cpp
branches/soc-2010-jwilkins/po/Makefile
branches/soc-2010-jwilkins/release/Makefile
branches/soc-2010-jwilkins/release/scripts/io/export_3ds.py
branches/soc-2010-jwilkins/release/scripts/io/export_fbx.py
branches/soc-2010-jwilkins/release/scripts/io/export_obj.py
branches/soc-2010-jwilkins/release/scripts/io/export_ply.py
branches/soc-2010-jwilkins/release/scripts/io/export_x3d.py
branches/soc-2010-jwilkins/release/scripts/io/import_scene_3ds.py
branches/soc-2010-jwilkins/release/scripts/modules/bpy/utils.py
branches/soc-2010-jwilkins/release/scripts/op/console_python.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_armature.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-jwilkins/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-jwilkins/release/scripts/ui/space_node.py
branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/effect.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/font.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/text.c
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_storage_types.h
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_matrix.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/storage.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/blenloader/intern/writefile.c
branches/soc-2010-jwilkins/source/blender/editors/armature/editarmature.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_layout.c
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-jwilkins/source/blender/editors/object/object_add.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2010-jwilkins/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-jwilkins/source/blender/editors/space_text/text_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_input.c
branches/soc-2010-jwilkins/source/blender/gpu/GPU_material.h
branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_texture_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
branches/soc-2010-jwilkins/source/blender/python/intern/bpy_rna.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/occlusion.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/rayshade.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/shadeoutput.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/texture.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/volumetric.c
branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
branches/soc-2010-jwilkins/source/darwin/Makefile
branches/soc-2010-jwilkins/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2010-jwilkins/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
Added Paths:
-----------
branches/soc-2010-jwilkins/build_files/make/dlltool/
branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile
branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def
branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def
branches/soc-2010-jwilkins/build_files/make/dlltool/python.def
branches/soc-2010-jwilkins/release/bin/
branches/soc-2010-jwilkins/release/bin/.blender/
branches/soc-2010-jwilkins/release/bin/.blender/.Blanguages
branches/soc-2010-jwilkins/release/bin/.blender/.bfont.ttf
branches/soc-2010-jwilkins/release/bin/.blender/locale/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ar/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ar/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/bg/
branches/soc-2010-jwilkins/release/bin/.blender/locale/bg/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ca/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ca/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/cs/
branches/soc-2010-jwilkins/release/bin/.blender/locale/cs/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/de/
branches/soc-2010-jwilkins/release/bin/.blender/locale/de/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/el/
branches/soc-2010-jwilkins/release/bin/.blender/locale/el/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/es/
branches/soc-2010-jwilkins/release/bin/.blender/locale/es/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/fi/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fi/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/fr/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fr/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr_HR/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/it/
branches/soc-2010-jwilkins/release/bin/.blender/locale/it/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ja/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ja/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ko/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ko/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/nl/
branches/soc-2010-jwilkins/release/bin/.blender/locale/nl/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/pl/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pl/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/pt_BR/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ro/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ro/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ru/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ru/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr at Latn/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/sv/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sv/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/uk/
branches/soc-2010-jwilkins/release/bin/.blender/locale/uk/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/zh_CN/
branches/soc-2010-jwilkins/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/blender-thumbnailer.py
branches/soc-2010-jwilkins/release/windows/installer/01.installer.bmp
Removed Paths:
-------------
branches/soc-2010-jwilkins/bin/
branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile
branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def
branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def
branches/soc-2010-jwilkins/build_files/make/dlltool/python.def
branches/soc-2010-jwilkins/dlltool/
branches/soc-2010-jwilkins/release/bin/.blender/
branches/soc-2010-jwilkins/release/bin/.blender/.Blanguages
branches/soc-2010-jwilkins/release/bin/.blender/.bfont.ttf
branches/soc-2010-jwilkins/release/bin/.blender/locale/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ar/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ar/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/bg/
branches/soc-2010-jwilkins/release/bin/.blender/locale/bg/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ca/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ca/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/cs/
branches/soc-2010-jwilkins/release/bin/.blender/locale/cs/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/de/
branches/soc-2010-jwilkins/release/bin/.blender/locale/de/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/el/
branches/soc-2010-jwilkins/release/bin/.blender/locale/el/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/es/
branches/soc-2010-jwilkins/release/bin/.blender/locale/es/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/fi/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fi/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/fr/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fr/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr_HR/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr_HR/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/it/
branches/soc-2010-jwilkins/release/bin/.blender/locale/it/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ja/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ja/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ko/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ko/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/nl/
branches/soc-2010-jwilkins/release/bin/.blender/locale/nl/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/pl/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pl/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/pt_BR/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pt_BR/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ro/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ro/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/ru/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ru/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr at Latn/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/sv/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sv/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/uk/
branches/soc-2010-jwilkins/release/bin/.blender/locale/uk/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/.blender/locale/zh_CN/
branches/soc-2010-jwilkins/release/bin/.blender/locale/zh_CN/LC_MESSAGES/
branches/soc-2010-jwilkins/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/soc-2010-jwilkins/release/bin/blender-thumbnailer.py
Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-28 12:11:40 UTC (rev 30835)
+++ branches/soc-2010-jwilkins/CMakeLists.txt 2010-07-28 12:31:31 UTC (rev 30836)
@@ -116,6 +116,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)
OPTION(WITH_ONSURFACEBRUSH "Enable use of the 'on-surface brush' for paint/sculpt. Requires a stencil buffer, GL_depth_texture, and GLSL" ON)
+OPTION(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
IF(APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -131,6 +132,10 @@
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+ MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
+ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+
TEST_SSE_SUPPORT()
# disabled for now, not supported
Modified: branches/soc-2010-jwilkins/Makefile
===================================================================
--- branches/soc-2010-jwilkins/Makefile 2010-07-28 12:11:40 UTC (rev 30835)
+++ branches/soc-2010-jwilkins/Makefile 2010-07-28 12:31:31 UTC (rev 30836)
@@ -45,7 +45,7 @@
SOURCEDIR =
ifeq ($(FREE_WINDOWS),true)
- DIRS ?= dlltool extern intern source po
+ DIRS ?= $(NANBLENDERHOME)/build_files/make/dlltool extern intern source po
else
DIRS ?= extern intern source po
endif
Copied: branches/soc-2010-jwilkins/build_files/make/dlltool (from rev 30814, trunk/blender/build_files/make/dlltool)
Deleted: branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile
===================================================================
--- trunk/blender/build_files/make/dlltool/Makefile 2010-07-27 19:22:23 UTC (rev 30814)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile 2010-07-28 12:31:31 UTC (rev 30836)
@@ -1,27 +0,0 @@
-include nan_definitions.mk
-
-all: ${NAN_GETTEXT}/lib/freegettext.a ${NAN_ICONV}/lib/freeiconv.a \
- ${NAN_PYTHON}/lib/freepy.a
-
-debug: all
-
-${NAN_GETTEXT}/lib/freegettext.a: gettext.def \
- ${NAN_GETTEXT}/lib/gnu_gettext.dll
- cp ${NAN_GETTEXT}/lib/gnu_gettext.dll .
- dlltool.exe -v --output-lib ${NAN_GETTEXT}/lib/freegettext.a \
- --input-def gettext.def \
- --dllname gnu_gettext.dll
- ranlib ${NAN_GETTEXT}/lib/freegettext.a
- rm ./gnu_gettext.dll
-
-${NAN_ICONV}/lib/freeiconv.a: iconv.def ${NAN_ICONV}/lib/iconv.dll
- cp ${NAN_ICONV}/lib/iconv.dll .
- dlltool.exe -v --output-lib ${NAN_ICONV}/lib/freeiconv.a \
- --input-def iconv.def \
- --dllname iconv.dll
- ranlib ${NAN_ICONV}/lib/freeiconv.a
- rm ./iconv.dll
-
-clean:
- $(RM) ${NAN_GETTEXT}/lib/freegettext.a \
- ${NAN_ICONV}/lib/freeiconv.a
Copied: branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile (from rev 30814, trunk/blender/build_files/make/dlltool/Makefile)
===================================================================
--- branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile (rev 0)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/Makefile 2010-07-28 12:31:31 UTC (rev 30836)
@@ -0,0 +1,27 @@
+include nan_definitions.mk
+
+all: ${NAN_GETTEXT}/lib/freegettext.a ${NAN_ICONV}/lib/freeiconv.a \
+ ${NAN_PYTHON}/lib/freepy.a
+
+debug: all
+
+${NAN_GETTEXT}/lib/freegettext.a: gettext.def \
+ ${NAN_GETTEXT}/lib/gnu_gettext.dll
+ cp ${NAN_GETTEXT}/lib/gnu_gettext.dll .
+ dlltool.exe -v --output-lib ${NAN_GETTEXT}/lib/freegettext.a \
+ --input-def gettext.def \
+ --dllname gnu_gettext.dll
+ ranlib ${NAN_GETTEXT}/lib/freegettext.a
+ rm ./gnu_gettext.dll
+
+${NAN_ICONV}/lib/freeiconv.a: iconv.def ${NAN_ICONV}/lib/iconv.dll
+ cp ${NAN_ICONV}/lib/iconv.dll .
+ dlltool.exe -v --output-lib ${NAN_ICONV}/lib/freeiconv.a \
+ --input-def iconv.def \
+ --dllname iconv.dll
+ ranlib ${NAN_ICONV}/lib/freeiconv.a
+ rm ./iconv.dll
+
+clean:
+ $(RM) ${NAN_GETTEXT}/lib/freegettext.a \
+ ${NAN_ICONV}/lib/freeiconv.a
Deleted: branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def
===================================================================
--- trunk/blender/build_files/make/dlltool/gettext.def 2010-07-27 19:22:23 UTC (rev 30814)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def 2010-07-28 12:31:31 UTC (rev 30836)
@@ -1,8 +0,0 @@
-LIBRARY GNU_GETTEXT.DLL
-EXPORTS
-bindtextdomain
-dcgettext
-dgettext
-gettext
-gettext_putenv
-textdomain
Copied: branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def (from rev 30814, trunk/blender/build_files/make/dlltool/gettext.def)
===================================================================
--- branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def (rev 0)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/gettext.def 2010-07-28 12:31:31 UTC (rev 30836)
@@ -0,0 +1,8 @@
+LIBRARY GNU_GETTEXT.DLL
+EXPORTS
+bindtextdomain
+dcgettext
+dgettext
+gettext
+gettext_putenv
+textdomain
Deleted: branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def
===================================================================
--- trunk/blender/build_files/make/dlltool/iconv.def 2010-07-27 19:22:23 UTC (rev 30814)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def 2010-07-28 12:31:31 UTC (rev 30836)
@@ -1,5 +0,0 @@
-LIBRARY ICONV.DLL
-EXPORTS
-libiconv_close
-libiconv_open
-libiconv
\ No newline at end of file
Copied: branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def (from rev 30814, trunk/blender/build_files/make/dlltool/iconv.def)
===================================================================
--- branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def (rev 0)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/iconv.def 2010-07-28 12:31:31 UTC (rev 30836)
@@ -0,0 +1,5 @@
+LIBRARY ICONV.DLL
+EXPORTS
+libiconv_close
+libiconv_open
+libiconv
\ No newline at end of file
Deleted: branches/soc-2010-jwilkins/build_files/make/dlltool/python.def
===================================================================
--- trunk/blender/build_files/make/dlltool/python.def 2010-07-27 19:22:23 UTC (rev 30814)
+++ branches/soc-2010-jwilkins/build_files/make/dlltool/python.def 2010-07-28 12:31:31 UTC (rev 30836)
@@ -1,758 +0,0 @@
-LIBRARY PYTHON22.DLL
-EXPORTS
-PyArg_Parse
-PyArg_ParseTuple
-PyArg_ParseTupleAndKeywords
-PyArg_UnpackTuple
-PyArg_VaParse
-PyBaseObject_Type
-PyBool_Type
-PyBool_FromLong
-PyBuffer_FromMemory
-PyBuffer_FromObject
-PyBuffer_FromReadWriteMemory
-PyBuffer_FromReadWriteObject
-PyBuffer_New
-PyBuffer_Type
-PyCFunction_Call
-PyCFunction_Fini
-PyCFunction_GetFlags
-PyCFunction_GetFunction
-PyCFunction_GetSelf
-PyCFunction_New
-PyCFunction_NewEx
-PyCFunction_Type
-PyCObject_AsVoidPtr
-PyCObject_FromVoidPtr
-PyCObject_FromVoidPtrAndDesc
-PyCObject_GetDesc
-PyCObject_Import
-PyCObject_Type
-PyCallIter_New
-PyCallIter_Type
-PyCallable_Check
-PyCell_Get
-PyCell_New
-PyCell_Set
-PyCell_Type
-PyClassMethod_New
-PyClassMethod_Type
-PyClass_IsSubclass
-PyClass_New
-PyClass_Type
-PyCode_Addr2Line
-PyCode_New
-PyCode_Type
-PyCodec_Decode
-PyCodec_Decoder
-PyCodec_Encode
-PyCodec_Encoder
-PyCodec_Register
-PyCodec_StreamReader
-PyCodec_StreamWriter
-PyComplex_AsCComplex
-PyComplex_FromCComplex
-PyComplex_FromDoubles
-PyComplex_ImagAsDouble
-PyComplex_RealAsDouble
-PyComplex_Type
-PyDescr_IsData
-PyDescr_NewGetSet
-PyDescr_NewMember
-PyDescr_NewMethod
-PyDescr_NewWrapper
-PyDictProxy_New
-PyDict_Clear
-PyDict_Copy
-PyDict_DelItem
-PyDict_DelItemString
-PyDict_GetItem
-PyDict_GetItemString
-PyDict_Items
-PyDict_Keys
-PyDict_Merge
-PyDict_MergeFromSeq2
-PyDict_New
-PyDict_Next
-PyDict_SetItem
-PyDict_SetItemString
-PyDict_Size
-PyDict_Type
-PyDict_Update
-PyDict_Values
-PyErr_BadArgument
-PyErr_BadInternalCall
-PyErr_CheckSignals
-PyErr_Clear
-PyErr_Display
-PyErr_ExceptionMatches
-PyErr_Fetch
-PyErr_Format
-PyErr_GivenExceptionMatches
-PyErr_NewException
-PyErr_NoMemory
-PyErr_NormalizeException
-PyErr_Occurred
-PyErr_Print
-PyErr_PrintEx
-PyErr_ProgramText
-PyErr_Restore
-PyErr_SetFromErrno
-PyErr_SetFromErrnoWithFilename
-PyErr_SetFromWindowsErr
-PyErr_SetFromWindowsErrWithFilename
-PyErr_SetInterrupt
-PyErr_SetNone
-PyErr_SetObject
-PyErr_SetString
-PyErr_SyntaxLocation
-PyErr_Warn
-PyErr_WarnExplicit
-PyErr_WriteUnraisable
-PyEval_AcquireLock
-PyEval_AcquireThread
-PyEval_CallFunction
-PyEval_CallMethod
-PyEval_CallObject
-PyEval_CallObjectWithKeywords
-PyEval_EvalCode
-PyEval_EvalCodeEx
-PyEval_GetBuiltins
-PyEval_GetFrame
-PyEval_GetFuncDesc
-PyEval_GetFuncName
-PyEval_GetGlobals
-PyEval_GetLocals
-PyEval_GetRestricted
-PyEval_InitThreads
-PyEval_MergeCompilerFlags
-PyEval_ReInitThreads
-PyEval_ReleaseLock
-PyEval_ReleaseThread
-PyEval_RestoreThread
-PyEval_SaveThread
-PyEval_SetProfile
-PyEval_SetTrace
-PyExc_ArithmeticError
-PyExc_AssertionError
-PyExc_AttributeError
-PyExc_DeprecationWarning
-PyExc_EOFError
-PyExc_EnvironmentError
-PyExc_Exception
-PyExc_FloatingPointError
-PyExc_IOError
-PyExc_ImportError
-PyExc_IndentationError
-PyExc_IndexError
-PyExc_KeyError
-PyExc_KeyboardInterrupt
-PyExc_LookupError
-PyExc_MemoryError
-PyExc_MemoryErrorInst
-PyExc_NameError
-PyExc_NotImplementedError
-PyExc_OSError
-PyExc_OverflowError
-PyExc_OverflowWarning
-PyExc_ReferenceError
-PyExc_RuntimeError
-PyExc_RuntimeWarning
-PyExc_StandardError
-PyExc_StopIteration
-PyExc_SyntaxError
-PyExc_SyntaxWarning
-PyExc_SystemError
-PyExc_SystemExit
-PyExc_TabError
-PyExc_TypeError
-PyExc_UnboundLocalError
-PyExc_UnicodeError
-PyExc_UserWarning
-PyExc_ValueError
-PyExc_Warning
-PyExc_WindowsError
-PyExc_ZeroDivisionError
-PyFile_AsFile
-PyFile_FromFile
-PyFile_FromString
-PyFile_GetLine
-PyFile_Name
-PyFile_SetBufSize
-PyFile_SoftSpace
-PyFile_Type
-PyFile_WriteObject
-PyFile_WriteString
-PyFloat_AsDouble
-PyFloat_AsReprString
-PyFloat_AsString
-PyFloat_Fini
-PyFloat_FromDouble
-PyFloat_FromString
-PyFloat_Type
-PyFrame_BlockPop
-PyFrame_BlockSetup
-PyFrame_FastToLocals
-PyFrame_Fini
-PyFrame_LocalsToFast
-PyFrame_New
-PyFrame_Type
-PyFunction_GetClosure
-PyFunction_GetCode
-PyFunction_GetDefaults
-PyFunction_GetGlobals
-PyFunction_New
-PyFunction_SetClosure
-PyFunction_SetDefaults
-PyFunction_Type
-PyImport_AddModule
-PyImport_AppendInittab
-PyImport_Cleanup
-PyImport_ExecCodeModule
-PyImport_ExecCodeModuleEx
-PyImport_ExtendInittab
-PyImport_FrozenModules
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list