From 3d222c3de6a281b4e7165634eb6e01f8010ecbc2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 10 Mar 2010 08:17:18 +0000 Subject: - scene sequencer camera override wasnt working for render strips (only opengl) - temp disable camera switching with override by clearning markers (hack) - check for GAMEBLENDER define else eclipse gets confused by multiple definitions of functons in the stub. --- source/blender/makesrna/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesrna/SConscript') diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index f78f931b669..cf31fb8e0e5 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -44,7 +44,7 @@ if env['BF_UNIT_TEST']: if env['OURPLATFORM'] == 'linux2': cflags='-pthread' - incs += ' ../../../extern/binreloc/include' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -- cgit v1.2.3 From c939331a6ccacc571c893646e209e99680a81aa5 Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Sat, 10 Apr 2010 09:31:41 +0000 Subject: QTKit (OSX 64bit): Add audio export to Quicktime Supports default OSX codecs : Linear PCM, Apple Lossless and AAC Note that AAC codec doesn't support sample rates above 48kHz. If a python/rna guru knows how to easily enforce this limit, he is welcome! Enjoy making Quicktime movies now with audio! --- source/blender/makesrna/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesrna/SConscript') diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index cf31fb8e0e5..71cfc3c7da4 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -6,7 +6,7 @@ objs = [] o = SConscript('intern/SConscript') objs += o -incs = '#/intern/guardedalloc ../blenkernel ../blenlib ../makesdna intern .' +incs = '#/intern/guardedalloc #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .' incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin' incs += ' ../render/extern/include' -- cgit v1.2.3 From 2be851c9665caab9e858f4c06ec59e7bb4201e17 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Fri, 21 May 2010 03:25:38 +0000 Subject: Blender TIFF support * Removed dynamic linking libTIFF code and change it to static linking (built into the blender executable). Dynamic linking made things a fair bit more complicated and wasn't working at all before on OS X - the dylib didn't exist and wasn't being copied. Since TIFF is more heavily depended upon now in Blender, it makes sense to make it less 'optional' and more in line with other libraries. I've updated both CMake and scons, and CMake on OS X/64bit works fine. It's now up to other platform/build system maintainers to enable this for their respective platforms (Campbell will check it for linux). For windows, and non-64bit osx, we need static libtiff libraries in /lib. I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons, so if blender won't build because of this, you should be able to disable these options until your build system has been updated. * Bonus feature: while doing this, I added support for loading 16bit and 32bit per channel TIFFs - they get converted to Blender's float buffers. Handy for zbrush displacement maps! --- source/blender/makesrna/SConscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/makesrna/SConscript') diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 71cfc3c7da4..c4ee90dde16 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -15,6 +15,9 @@ defs = [] if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') +if env['WITH_BF_TIFF']: + defs.append('WITH_TIFF') + if env['WITH_BF_OPENJPEG']: defs.append('WITH_OPENJPEG') -- cgit v1.2.3 From ca81aa704e958a73a55e79654f70eaa9a0fad85a Mon Sep 17 00:00:00 2001 From: Andrea Weikert Date: Sun, 4 Jul 2010 15:35:23 +0000 Subject: Patch [#22339] File/installation paths changes Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127 This patch implements the proposal outlined here: http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal Original patch by Matt Ebb. Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert NOTE: This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory. Commit discussed on IRC with Ton and Campbell. --- source/blender/makesrna/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna/SConscript') diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index c4ee90dde16..bd500adc8e4 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -37,7 +37,8 @@ if env['WITH_BF_QUICKTIME']: if env['WITH_BF_LCMS']: defs.append('WITH_LCMS') - + incs += ' ' + env['BF_LCMS_INC'] + if env['WITH_BF_GAMEENGINE']: defs.append('GAMEBLENDER=1') -- cgit v1.2.3 From 5505697ac508c02b8a2e196c5a8c07431bc687cf Mon Sep 17 00:00:00 2001 From: Jason Wilkins Date: Wed, 14 Jul 2010 14:11:03 +0000 Subject: Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details. --- source/blender/makesrna/SConscript | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/makesrna/SConscript') diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index bd500adc8e4..1558eef713e 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -45,7 +45,6 @@ if env['WITH_BF_GAMEENGINE']: if env['BF_UNIT_TEST']: defs.append('UNIT_TEST') - if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' -- cgit v1.2.3