Revision: 41037
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41037
Author: nazgul
Date: 2011-10-15 19:19:24 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Merging r40990 through r41036 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40990
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41036
Modified Paths:
--------------
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/build_files/cmake/Modules/FindGLEW.cmake
branches/soc-2011-tomato/build_files/cmake/RpmBuild.cmake
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/po/update_msg.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/scons/scons.py
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idcode.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sound.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-tomato/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-tomato/source/blender/editors/include/ED_fileselect.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_anim.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_file/filesel.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2011-tomato/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_socket.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/darwin/blender.app/Contents/Info.plist
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/templates/driver_functions.py
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/soc-2011-tomato/source/darwin/set_simulation_threads_applescript.scpt
Removed Paths:
-------------
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-tomato/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40989
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41036
Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile 2011-10-15 16:20:41 UTC (rev
41036)
+++ branches/soc-2011-tomato/GNUmakefile 2011-10-15 19:19:24 UTC (rev
41037)
@@ -233,7 +233,7 @@
doc_py:
$(BUILD_DIR)/bin/blender --background --factory-startup --python
doc/python_api/sphinx_doc_gen.py
cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
- @echo "docs written into: 'doc/python_api/sphinx-out/index.html'"
+ @echo "docs written into:
'$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
clean:
Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindGLEW.cmake
2011-10-15 16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindGLEW.cmake
2011-10-15 19:19:24 UTC (rev 41037)
@@ -51,9 +51,9 @@
ENDIF (WIN32)
IF (GLEW_INCLUDE_PATH)
- SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+ SET(GLEW_FOUND TRUE)
ELSE (GLEW_INCLUDE_PATH)
- SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+ SET(GLEW_FOUND FALSE)
ENDIF (GLEW_INCLUDE_PATH)
MARK_AS_ADVANCED( GLEW_FOUND )
Modified: branches/soc-2011-tomato/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/RpmBuild.cmake 2011-10-15
16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/build_files/cmake/RpmBuild.cmake 2011-10-15
19:19:24 UTC (rev 41037)
@@ -3,17 +3,24 @@
# Authors: Rohit Yadav <[email protected]>
#
-find_program(RPMBUILD
- NAMES rpmbuild
- PATHS "/usr/bin")
+if(NOT DEFINED RPMBUILD)
-mark_as_advanced(RPMBUILD)
+ find_program(RPMBUILD
+ NAMES rpmbuild
+ PATHS "/usr/bin")
+ mark_as_advanced(RPMBUILD)
+
+ if(RPMBUILD)
+ message(STATUS "RPM Build Found: ${RPMBUILD}")
+ else(RPMBUILD)
+ message(STATUS "RPM Build Not Found (rpmbuild). RPM generation
will not be available")
+ endif()
+
+endif()
+
if(RPMBUILD)
- get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
- message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
- set(RPMBUILD_FOUND "YES")
+ set(RPMBUILD_FOUND TRUE)
else(RPMBUILD)
- message(STATUS "rpmbuild NOT found. RPM generation will not be available")
- set(RPMBUILD_FOUND "NO")
-endif()
+ set(RPMBUILD_FOUND FALSE)
+endif()
\ No newline at end of file
Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2011-10-15
16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2011-10-15
19:19:24 UTC (rev 41037)
@@ -586,6 +586,20 @@
commands.getoutput(cmd)
cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir,
binary)
commands.getoutput(cmd)
+ if env['CC'].endswith('4.6.1'): # for correct errorhandling with gcc 4.6.1
we need the gcc.dylib to link, thus distribute in app-bundle
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
+ commands.getoutput(cmd)
+ instname = env['BF_CXX']
+ cmd = 'cp %s/lib/libgcc_s.1.dylib
%s/%s.app/Contents/MacOS/lib/'%(instname, installdir, binary)
+ commands.getoutput(cmd)
+ cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib
%s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
+ commands.getoutput(cmd)
+ cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib
@executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname,
installdir, binary, binary)
+ commands.getoutput(cmd)
+ cmd = 'rm -rf %s/set_simulation_threads.app'%(installdir) # first
clear omp_num_threads applescript
+ commands.getoutput(cmd)
+ cmd = 'cp -R %s/source/darwin/set_simulation_threads.app
%s/'%(bldroot, installdir) # copy the omp_num_threads applescript
+ commands.getoutput(cmd)
# extract copy system python, be sure to update other build systems
# when making changes to the files that are copied.
Modified:
branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
2011-10-15 16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
2011-10-15 19:19:24 UTC (rev 41037)
@@ -32,7 +32,8 @@
AUD_DynamicIIRFilterReader::AUD_DynamicIIRFilterReader(AUD_Reference<AUD_IReader>
reader,
AUD_Reference<AUD_DynamicIIRFilterFactory> factory) :
- AUD_IIRFilterReader(reader, std::vector<float>(), std::vector<float>())
+ AUD_IIRFilterReader(reader, std::vector<float>(), std::vector<float>()),
+ m_factory(factory)
{
sampleRateChanged(reader->getSpecs().rate);
}
Modified: branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.cpp
2011-10-15 16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/intern/audaspace/FX/AUD_IIRFilterReader.cpp
2011-10-15 19:19:24 UTC (rev 41037)
@@ -36,11 +36,14 @@
const std::vector<float>& a) :
AUD_BaseIIRFilterReader(reader, b.size(), a.size()), m_a(a), m_b(b)
{
- for(int i = 1; i < m_a.size(); i++)
- m_a[i] /= m_a[0];
- for(int i = 0; i < m_b.size(); i++)
- m_b[i] /= m_a[0];
- m_a[0] = 1;
+ if(m_a.size())
+ {
+ for(int i = 1; i < m_a.size(); i++)
+ m_a[i] /= m_a[0];
+ for(int i = 0; i < m_b.size(); i++)
+ m_b[i] /= m_a[0];
+ m_a[0] = 1;
+ }
}
sample_t AUD_IIRFilterReader::filter()
@@ -58,7 +61,7 @@
void AUD_IIRFilterReader::setCoefficients(const std::vector<float>& b,
const std::vector<float>& a)
{
- setLengths(m_b.size(), m_a.size());
+ setLengths(b.size(), a.size());
m_a = a;
m_b = b;
}
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
2011-10-15 16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
2011-10-15 19:19:24 UTC (rev 41037)
@@ -826,42 +826,51 @@
AUD_Reference<AUD_IFactory> file = new AUD_FileFactory(filename);
- AUD_Reference<AUD_IReader> reader = file->createReader();
- AUD_SampleRate rate = reader->getSpecs().rate;
+ int position = 0;
- sound = new AUD_ChannelMapperFactory(file, specs);
+ try
+ {
+ AUD_Reference<AUD_IReader> reader = file->createReader();
- if(high < rate)
- sound = new AUD_LowpassFactory(sound, high);
- if(low > 0)
- sound = new AUD_HighpassFactory(sound, low);
+ AUD_SampleRate rate = reader->getSpecs().rate;
- sound = new AUD_EnvelopeFactory(sound, attack, release, threshold,
0.1f);
- sound = new AUD_LinearResampleFactory(sound, specs);
+ sound = new AUD_ChannelMapperFactory(file, specs);
- if(square)
- sound = new AUD_SquareFactory(sound, sthreshold);
+ if(high < rate)
+ sound = new AUD_LowpassFactory(sound, high);
+ if(low > 0)
+ sound = new AUD_HighpassFactory(sound, low);
- if(accumulate)
- sound = new AUD_AccumulatorFactory(sound, additive);
- else if(additive)
- sound = new AUD_SumFactory(sound);
+ sound = new AUD_EnvelopeFactory(sound, attack, release,
threshold, 0.1f);
+ sound = new AUD_LinearResampleFactory(sound, specs);
- reader = sound->createReader();
+ if(square)
+ sound = new AUD_SquareFactory(sound, sthreshold);
- if(reader.isNull())
- return NULL;
+ if(accumulate)
+ sound = new AUD_AccumulatorFactory(sound, additive);
+ else if(additive)
+ sound = new AUD_SumFactory(sound);
- int len;
- int position = 0;
- bool eos;
- do
+ reader = sound->createReader();
+
+ if(reader.isNull())
+ return NULL;
+
+ int len;
+ bool eos;
+ do
+ {
+ len = samplerate;
+ buffer.resize((position + len) * sizeof(float), true);
+ reader->read(len, eos, buffer.getBuffer() + position);
+ position += len;
+ } while(!eos);
+ }
+ catch(AUD_Exception&)
{
- len = samplerate;
- buffer.resize((position + len) * sizeof(float), true);
- reader->read(len, eos, buffer.getBuffer() + position);
- position += len;
- } while(!eos);
+ return NULL;
+ }
float* result = (float*)malloc(position * sizeof(float));
memcpy(result, buffer.getBuffer(), position * sizeof(float));
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.cpp
2011-10-15 16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_NULLDevice.cpp
2011-10-15 19:19:24 UTC (rev 41037)
@@ -69,7 +69,7 @@
float AUD_NULLDevice::AUD_NULLHandle::getPosition()
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
AUD_Status AUD_NULLDevice::AUD_NULLHandle::getStatus()
@@ -79,7 +79,7 @@
float AUD_NULLDevice::AUD_NULLHandle::getVolume()
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
bool AUD_NULLDevice::AUD_NULLHandle::setVolume(float volume)
@@ -89,7 +89,7 @@
float AUD_NULLDevice::AUD_NULLHandle::getPitch()
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
bool AUD_NULLDevice::AUD_NULLHandle::setPitch(float pitch)
@@ -153,7 +153,7 @@
float AUD_NULLDevice::getVolume() const
{
- return 0;
+ return std::numeric_limits<float>::quiet_NaN();
}
void AUD_NULLDevice::setVolume(float volume)
Modified: branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
2011-10-15 16:20:41 UTC (rev 41036)
+++ branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
2011-10-15 19:19:24 UTC (rev 41037)
@@ -636,7 +636,7 @@
} else{
error = -1;
name = check_memlist(memh);
- if (name == NULL)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
