[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41504] branches/bmesh/blender: svn merge -r41480:41503 ^/trunk/blender
Campbell Barton
ideasman42 at gmail.com
Thu Nov 3 23:58:10 CET 2011
Revision: 41504
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41504
Author: campbellbarton
Date: 2011-11-03 22:58:05 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
svn merge -r41480:41503 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41480
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp
branches/bmesh/blender/release/scripts/modules/bpy/__init__.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_dopesheet.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_graph.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_nla.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_time.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenkernel/BKE_curve.h
branches/bmesh/blender/source/blender/blenkernel/BKE_global.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/editors/include/ED_render.h
branches/bmesh/blender/source/blender/editors/render/render_internal.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tree.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/imbuf/intern/moviecache.c
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/python/BPY_extern.h
branches/bmesh/blender/source/blender/python/generic/IDProp.c
branches/bmesh/blender/source/blender/python/generic/IDProp.h
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_handlers.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_import.m
branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/render/intern/source/initrender.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/shadbuf.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/bmesh/blender/source/gameengine/Expressions/ListValue.cpp
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/bmesh/blender/source/gameengine/Expressions/StringValue.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonSeq.h
branches/bmesh/blender/source/gameengine/VideoTexture/BlendType.h
branches/bmesh/blender/source/gameengine/VideoTexture/FilterBase.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageBase.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/Texture.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41480
+ /trunk/blender:39992-41503
Modified: branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-11-03 17:06:12 UTC (rev 41503)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-11-03 22:58:05 UTC (rev 41504)
@@ -149,6 +149,20 @@
WITH_BF_OPENMP = True
+'''
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = LIBDIR + '/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_46_1 libboost_filesystem-vc90-mt-s-1_46_1 libboost_regex-vc90-mt-s-1_46_1 libboost_system-vc90-mt-s-1_46_1 libboost_thread-vc90-mt-s-1_46_1'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+'''
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
Modified: branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-11-03 17:06:12 UTC (rev 41503)
+++ branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-11-03 22:58:05 UTC (rev 41504)
@@ -153,6 +153,20 @@
WITH_BF_OPENMP = True
+'''
+WITH_BF_OIIO = True
+BF_OIIO = LIBDIR + '/openimageio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+BF_BOOST = LIBDIR + '/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_45 libboost_filesystem-vc90-mt-s-1_45 libboost_regex-vc90-mt-s-1_45 libboost_system-vc90-mt-s-1_45 libboost_thread-vc90-mt-s-1_45'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+'''
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-11-03 17:06:12 UTC (rev 41503)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-11-03 22:58:05 UTC (rev 41504)
@@ -192,6 +192,11 @@
if lenv['WITH_BF_OPENMP']:
if lenv['OURPLATFORM'] == 'linuxcross':
libincs += Split(lenv['BF_OPENMP_LIBPATH'])
+
+ if lenv['WITH_BF_OIIO']:
+ libincs += Split(lenv['BF_OIIO_LIBPATH'])
+ if lenv['WITH_BF_BOOST']:
+ libincs += Split(lenv['BF_BOOST_LIBPATH'])
# setting this last so any overriding of manually libs could be handled
if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
@@ -275,6 +280,11 @@
if not lenv['WITH_BF_STATIC3DMOUSE']:
syslibs += Split(lenv['BF_3DMOUSE_LIB'])
+ if lenv['WITH_BF_OIIO']:
+ syslibs += Split(lenv['BF_OIIO_LIB'])
+ if lenv['WITH_BF_BOOST']:
+ syslibs += Split(lenv['BF_BOOST_LIB'])
+
syslibs += lenv['LLIBS']
return syslibs
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-11-03 17:06:12 UTC (rev 41503)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-11-03 22:58:05 UTC (rev 41504)
@@ -116,7 +116,9 @@
'WITH_BF_INTERNATIONAL',
'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
- 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'WITH_BF_ELTOPO', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+ 'WITH_BF_GAMEENGINE',
+ 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+ 'WITH_BF_ELTOPO',
'BF_WINTAB', 'BF_WINTAB_INC',
'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
@@ -133,12 +135,10 @@
'WITHOUT_BF_INSTALL',
'WITHOUT_BF_PYTHON_INSTALL',
'WITHOUT_BF_OVERWRITE_INSTALL',
- 'WITH_BF_OPENMP',
- 'BF_OPENMP',
- 'BF_OPENMP_INC',
- 'BF_OPENMP_LIBPATH',
+ 'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
'WITH_GHOST_COCOA',
'WITH_GHOST_SDL',
+ 'BF_GHOST_DEBUG',
'USE_QTKIT',
'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
'BF_X264_CONFIG',
@@ -147,7 +147,6 @@
'BF_NUMJOBS',
'BF_MSVS',
'BF_VERSION',
- 'BF_GHOST_DEBUG',
'WITH_BF_RAYOPTIMIZATION',
'BF_RAYOPTIMIZATION_SSE_FLAGS',
'WITH_BF_FLUID',
@@ -155,7 +154,10 @@
'WITH_BF_BOOLEAN',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
- 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
+ 'BUILDBOT_BRANCH',
+ 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
+ 'WITH_BF_OIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIBPATH',
+ 'WITH_BF_BOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIBPATH'
]
# Have options here that scons expects to be lists
@@ -239,9 +241,9 @@
('LCGDIR', 'location of cvs lib dir'),
(BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
(BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)),
- ('BF_PYTHON', 'base path for python', ''),
+ ('BF_PYTHON', 'Base path for python', ''),
('BF_PYTHON_VERSION', 'Python version to use', ''),
- ('BF_PYTHON_INC', 'include path for Python headers', ''),
+ ('BF_PYTHON_INC', 'Include path for Python headers', ''),
('BF_PYTHON_BINARY', 'Path to the Python interpreter', ''),
('BF_PYTHON_LIB', 'Python library', ''),
('BF_PYTHON_DLL', 'Python dll - used on Windows only', ''),
@@ -257,8 +259,8 @@
(BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
- ('BF_OPENAL', 'base path for OpenAL', ''),
- ('BF_OPENAL_INC', 'include path for python headers', ''),
+ ('BF_OPENAL', 'Base path for OpenAL', ''),
+ ('BF_OPENAL_INC', 'Include path for python headers', ''),
('BF_OPENAL_LIB', 'Path to OpenAL library', ''),
('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''),
('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''),
@@ -532,6 +534,16 @@
(BoolVariable('WITH_BF_CXX_GUARDEDALLOC', 'Enable GuardedAlloc for C++ memory allocation tracking.', False)),
('BUILDBOT_BRANCH', 'Buildbot branch name', ''),
+
+ (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
+ ('BF_OIIO_INC', 'OIIO include path', ''),
+ ('BF_OIIO_LIB', 'OIIO library', ''),
+ ('BF_OIIO_LIBPATH', 'OIIO library path', ''),
+
+ (BoolVariable('WITH_BF_BOOST', 'Build with Boost', False)),
+ ('BF_BOOST_INC', 'Boost include path', ''),
+ ('BF_BOOST_LIB', 'Boost library', ''),
+ ('BF_BOOST_LIBPATH', 'Boost library path', '')
) # end of opts.AddOptions()
return localopts
Modified: branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp
===================================================================
--- branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp 2011-11-03 17:06:12 UTC (rev 41503)
+++ branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp 2011-11-03 22:58:05 UTC (rev 41504)
@@ -226,7 +226,7 @@
if(!PyArg_ParseTuple(args, "f|f:lowpass", &frequency, &Q))
return NULL;
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
Factory *parent = (Factory*)type->tp_alloc(type, 0);
if(parent != NULL)
@@ -267,7 +267,7 @@
if(!PyArg_ParseTuple(args, "f:delay", &delay))
return NULL;
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
Factory *parent = (Factory*)type->tp_alloc(type, 0);
if(parent != NULL)
@@ -303,7 +303,7 @@
static PyObject *
Factory_join(Factory* self, PyObject* object)
{
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
if(!PyObject_TypeCheck(object, type))
{
@@ -354,7 +354,7 @@
if(!PyArg_ParseTuple(args, "f|f:highpass", &frequency, &Q))
return NULL;
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
Factory *parent = (Factory*)type->tp_alloc(type, 0);
if(parent != NULL)
@@ -395,7 +395,7 @@
if(!PyArg_ParseTuple(args, "ff:limit", &start, &end))
return NULL;
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
Factory *parent = (Factory*)type->tp_alloc(type, 0);
if(parent != NULL)
@@ -439,7 +439,7 @@
if(!PyArg_ParseTuple(args, "f:pitch", &factor))
return NULL;
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
Factory *parent = (Factory*)type->tp_alloc(type, 0);
if(parent != NULL)
@@ -481,7 +481,7 @@
if(!PyArg_ParseTuple(args, "f:volume", &volume))
return NULL;
- PyTypeObject* type = ((PyObject*)self)->ob_type;
+ PyTypeObject* type = Py_TYPE(self);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list