[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22988] branches/itasc: svn merge -r 22946 :22987 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Fri Sep 4 12:22:43 CEST 2009
Revision: 22988
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22988
Author: ben2610
Date: 2009-09-04 12:22:42 +0200 (Fri, 04 Sep 2009)
Log Message:
-----------
svn merge -r 22946:22987 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/SConstruct
branches/itasc/blenderplayer/CMakeLists.txt
branches/itasc/release/io/netrender/utils.py
branches/itasc/release/ui/bpy_ops.py
branches/itasc/release/ui/buttons_data_armature.py
branches/itasc/release/ui/buttons_data_bone.py
branches/itasc/release/ui/buttons_data_modifier.py
branches/itasc/release/ui/space_console.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/source/blender/blenkernel/BKE_constraint.h
branches/itasc/source/blender/blenkernel/intern/anim_sys.c
branches/itasc/source/blender/blenkernel/intern/constraint.c
branches/itasc/source/blender/blenlib/BLI_arithb.h
branches/itasc/source/blender/blenlib/BLI_voxel.h
branches/itasc/source/blender/blenlib/intern/arithb.c
branches/itasc/source/blender/blenlib/intern/threads.c
branches/itasc/source/blender/blenlib/intern/voxel.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/animation/anim_channels_defines.c
branches/itasc/source/blender/editors/animation/anim_intern.h
branches/itasc/source/blender/editors/animation/anim_ops.c
branches/itasc/source/blender/editors/animation/drivers.c
branches/itasc/source/blender/editors/animation/keyframes_draw.c
branches/itasc/source/blender/editors/animation/keyframes_edit.c
branches/itasc/source/blender/editors/animation/keyframes_general.c
branches/itasc/source/blender/editors/animation/keyframing.c
branches/itasc/source/blender/editors/animation/keyingsets.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/gpencil/gpencil_buttons.c
branches/itasc/source/blender/editors/include/ED_anim_api.h
branches/itasc/source/blender/editors/include/ED_keyframes_draw.h
branches/itasc/source/blender/editors/include/ED_keyframes_edit.h
branches/itasc/source/blender/editors/include/ED_keyframing.h
branches/itasc/source/blender/editors/interface/interface_anim.c
branches/itasc/source/blender/editors/interface/interface_handlers.c
branches/itasc/source/blender/editors/interface/interface_intern.h
branches/itasc/source/blender/editors/object/editconstraint.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/object/object_intern.h
branches/itasc/source/blender/editors/object/object_modifier.c
branches/itasc/source/blender/editors/object/object_ops.c
branches/itasc/source/blender/editors/physics/ed_pointcache.c
branches/itasc/source/blender/editors/screen/screen_ops.c
branches/itasc/source/blender/editors/space_action/action_edit.c
branches/itasc/source/blender/editors/space_action/action_header.c
branches/itasc/source/blender/editors/space_action/action_intern.h
branches/itasc/source/blender/editors/space_action/action_ops.c
branches/itasc/source/blender/editors/space_buttons/buttons_context.c
branches/itasc/source/blender/editors/space_buttons/buttons_ops.c
branches/itasc/source/blender/editors/space_console/console_ops.c
branches/itasc/source/blender/editors/space_console/console_report.c
branches/itasc/source/blender/editors/space_console/space_console.c
branches/itasc/source/blender/editors/space_file/file_intern.h
branches/itasc/source/blender/editors/space_file/file_ops.c
branches/itasc/source/blender/editors/space_file/space_file.c
branches/itasc/source/blender/editors/space_graph/graph_edit.c
branches/itasc/source/blender/editors/space_graph/graph_header.c
branches/itasc/source/blender/editors/space_logic/logic_window.c
branches/itasc/source/blender/editors/space_logic/space_logic.c
branches/itasc/source/blender/editors/space_nla/nla_buttons.c
branches/itasc/source/blender/editors/space_nla/nla_draw.c
branches/itasc/source/blender/editors/space_text/text_ops.c
branches/itasc/source/blender/editors/transform/transform_conversions.c
branches/itasc/source/blender/makesdna/DNA_constraint_types.h
branches/itasc/source/blender/makesdna/DNA_curve_types.h
branches/itasc/source/blender/makesdna/DNA_texture_types.h
branches/itasc/source/blender/makesdna/DNA_windowmanager_types.h
branches/itasc/source/blender/makesrna/RNA_enum_types.h
branches/itasc/source/blender/makesrna/intern/rna_ID.c
branches/itasc/source/blender/makesrna/intern/rna_curve.c
branches/itasc/source/blender/makesrna/intern/rna_fcurve.c
branches/itasc/source/blender/makesrna/intern/rna_gpencil.c
branches/itasc/source/blender/makesrna/intern/rna_nla.c
branches/itasc/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/itasc/source/blender/makesrna/intern/rna_texture.c
branches/itasc/source/blender/python/epy_doc_gen.py
branches/itasc/source/blender/python/intern/bpy_array.c
branches/itasc/source/blender/python/intern/bpy_interface.c
branches/itasc/source/blender/python/intern/bpy_operator.c
branches/itasc/source/blender/python/intern/bpy_operator_wrap.c
branches/itasc/source/blender/python/intern/bpy_rna.c
branches/itasc/source/blender/python/intern/bpy_util.c
branches/itasc/source/blender/python/intern/bpy_util.h
branches/itasc/source/blender/render/intern/source/voxeldata.c
branches/itasc/source/blender/windowmanager/WM_api.h
branches/itasc/source/blender/windowmanager/intern/wm.c
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/blender/windowmanager/intern/wm_files.c
branches/itasc/source/blender/windowmanager/intern/wm_operators.c
branches/itasc/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/itasc/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/itasc/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonSeq.cpp
Added Paths:
-----------
branches/itasc/blenderplayer/bad_level_call_stubs/
branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/itasc/blenderplayer/bad_level_call_stubs/Makefile
branches/itasc/blenderplayer/bad_level_call_stubs/SConscript
branches/itasc/blenderplayer/bad_level_call_stubs/stubs.c
Removed Paths:
-------------
branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/itasc/blenderplayer/bad_level_call_stubs/Makefile
branches/itasc/blenderplayer/bad_level_call_stubs/SConscript
branches/itasc/blenderplayer/bad_level_call_stubs/stubs.c
Modified: branches/itasc/SConstruct
===================================================================
--- branches/itasc/SConstruct 2009-09-04 10:00:25 UTC (rev 22987)
+++ branches/itasc/SConstruct 2009-09-04 10:22:42 UTC (rev 22988)
@@ -207,7 +207,6 @@
env.Append(CCFLAGS=['-fopenmp'])
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(CXXFLAGS=['-fopenmp'])
- # env.Append(LINKFLAGS=['-fprofile-generate'])
#check for additional debug libnames
@@ -301,7 +300,6 @@
env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
-#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
B.root_build_dir = env['BF_BUILDDIR']
B.doc_build_dir = env['BF_DOCDIR']
if not B.root_build_dir[-1]==os.sep:
@@ -402,11 +400,7 @@
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
-if env['WITH_BF_PLAYER']:
- print("Warning: Game player may not build on 2.5")
-
if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
- #env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
@@ -575,16 +569,13 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+ if env['WITH_BF_SNDFILE']:
+ dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
if env['WITH_BF_FFMPEG']:
dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-# '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-# '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-# '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-# '${LCGDIR}/ffmpeg/lib/libx264-67.dll',
-# '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
if env['WITH_BF_JACK']:
dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
Modified: branches/itasc/blenderplayer/CMakeLists.txt
===================================================================
--- branches/itasc/blenderplayer/CMakeLists.txt 2009-09-04 10:00:25 UTC (rev 22987)
+++ branches/itasc/blenderplayer/CMakeLists.txt 2009-09-04 10:22:42 UTC (rev 22988)
@@ -80,11 +80,11 @@
bf_oglrasterizer
bf_expressions
bf_scenegraph
- bf_IK
+ bf_IK
bf_moto
bf_kernel
bf_nodes
- bf_gpu
+ bf_gpu
bf_imbuf
bf_avi
kx_network
@@ -93,15 +93,21 @@
extern_bullet
bf_guardedalloc
bf_memutil
+ bf_python
+ bf_gen_python
bf_blenlib
bf_cineon
bf_openexr
extern_libopenjpeg
bf_dds
bf_readblenfile
+ bf_dna
+ bf_rna
+ bf_blenfont
+ bf_audaspace
blenkernel_blc
extern_binreloc
- extern_glew
+ extern_glew
)
IF(WITH_QUICKTIME)
@@ -130,4 +136,8 @@
TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
ENDIF(UNIX)
+IF(WITH_PLAYER)
+ ADD_SUBDIRECTORY(bad_level_call_stubs)
+ENDIF(WITH_PLAYER)
+
SETUP_LIBLINKS(blenderplayer)
Copied: branches/itasc/blenderplayer/bad_level_call_stubs (from rev 22987, branches/blender2.5/blender/blenderplayer/bad_level_call_stubs)
Deleted: branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/CMakeLists.txt 2009-09-04 10:00:25 UTC (rev 22987)
+++ branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt 2009-09-04 10:22:42 UTC (rev 22988)
@@ -1,40 +0,0 @@
-# $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-FILE(GLOB SRC stubs.c)
-
-SET(INC
- .
- ..
- ../../source/blender/makesdna
- ../../source/blender/makesrna
-)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DWITH_FREETYPE2)
-ENDIF(WITH_INTERNATIONAL)
-
-BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}")
Copied: branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt (from rev 22987, branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/CMakeLists.txt)
===================================================================
--- branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt (rev 0)
+++ branches/itasc/blenderplayer/bad_level_call_stubs/CMakeLists.txt 2009-09-04 10:22:42 UTC (rev 22988)
@@ -0,0 +1,40 @@
+# $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+FILE(GLOB SRC stubs.c)
+
+SET(INC
+ .
+ ..
+ ../../source/blender/makesdna
+ ../../source/blender/makesrna
+)
+
+IF(WITH_INTERNATIONAL)
+ ADD_DEFINITIONS(-DWITH_FREETYPE2)
+ENDIF(WITH_INTERNATIONAL)
+
+BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}")
Deleted: branches/itasc/blenderplayer/bad_level_call_stubs/Makefile
===================================================================
--- branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/Makefile 2009-09-04 10:00:25 UTC (rev 22987)
+++ branches/itasc/blenderplayer/bad_level_call_stubs/Makefile 2009-09-04 10:22:42 UTC (rev 22988)
@@ -1,45 +0,0 @@
-#
-# $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): none yet.
-#
-# ***** END GPL LICENSE BLOCK *****
-#
-#
-
-LIBNAME = blenkernel_blc
-DIR = $(OCGDIR)/blenderplayer/$(LIBNAME)
-
-include nan_compile.mk
-
-CFLAGS += $(LEVEL_2_C_WARNINGS)
-CFLAGS += $(FIX_STUBS_WARNINGS)
-
-CPPFLAGS += $(OGL_CPPFLAGS)
-CPPFLAGS += -I../../source/blender/makesdna
-CPPFLAGS += -I../../source/blender/makesrna
-
-# path to our own external headerfiles
-CPPFLAGS += -I..
-
Copied: branches/itasc/blenderplayer/bad_level_call_stubs/Makefile (from rev 22987, branches/blender2.5/blender/blenderplayer/bad_level_call_stubs/Makefile)
===================================================================
--- branches/itasc/blenderplayer/bad_level_call_stubs/Makefile (rev 0)
+++ branches/itasc/blenderplayer/bad_level_call_stubs/Makefile 2009-09-04 10:22:42 UTC (rev 22988)
@@ -0,0 +1,45 @@
+#
+# $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = blenkernel_blc
+DIR = $(OCGDIR)/blenderplayer/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_2_C_WARNINGS)
+CFLAGS += $(FIX_STUBS_WARNINGS)
+
+CPPFLAGS += $(OGL_CPPFLAGS)
+CPPFLAGS += -I../../source/blender/makesdna
+CPPFLAGS += -I../../source/blender/makesrna
+
+# path to our own external headerfiles
+CPPFLAGS += -I..
+
Deleted: branches/itasc/blenderplayer/bad_level_call_stubs/SConscript
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list