Revision: 40997
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40997
Author: campbellbarton
Date: 2011-10-14 01:35:20 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40890:40950
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40890
Modified Paths:
--------------
branches/bmesh/blender/doc/build_systems/cmake.txt
branches/bmesh/blender/doc/build_systems/scons-dev.txt
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
branches/bmesh/blender/po/POTFILES.in
branches/bmesh/blender/po/README.txt
branches/bmesh/blender/po/ar.po
branches/bmesh/blender/po/bg.po
branches/bmesh/blender/po/ca.po
branches/bmesh/blender/po/cs.po
branches/bmesh/blender/po/de.po
branches/bmesh/blender/po/el.po
branches/bmesh/blender/po/es.po
branches/bmesh/blender/po/fi.po
branches/bmesh/blender/po/fr.po
branches/bmesh/blender/po/hr.po
branches/bmesh/blender/po/it.po
branches/bmesh/blender/po/ja.po
branches/bmesh/blender/po/ko.po
branches/bmesh/blender/po/ne.po
branches/bmesh/blender/po/nl.po
branches/bmesh/blender/po/pl.po
branches/bmesh/blender/po/pt_BR.po
branches/bmesh/blender/po/ro.po
branches/bmesh/blender/po/ru.po
branches/bmesh/blender/po/sr.po
branches/bmesh/blender/po/[email protected]
branches/bmesh/blender/po/sv.po
branches/bmesh/blender/po/uk.po
branches/bmesh/blender/po/zh_CN.po
branches/bmesh/blender/po/zh_TW.po
branches/bmesh/blender/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/scripts/modules/bpy/path.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/image.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/blenkernel/BKE_action.h
branches/bmesh/blender/source/blender/blenkernel/BKE_anim.h
branches/bmesh/blender/source/blender/blenkernel/BKE_animsys.h
branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
branches/bmesh/blender/source/blender/blenkernel/BKE_bullet.h
branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
branches/bmesh/blender/source/blender/blenkernel/BKE_displist.h
branches/bmesh/blender/source/blender/blenkernel/BKE_icons.h
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/bmesh/blender/source/blender/blenkernel/BKE_nla.h
branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
branches/bmesh/blender/source/blender/blenkernel/BKE_pointcache.h
branches/bmesh/blender/source/blender/blenkernel/BKE_shrinkwrap.h
branches/bmesh/blender/source/blender/blenkernel/BKE_subsurf.h
branches/bmesh/blender/source/blender/blenkernel/BKE_suggestions.h
branches/bmesh/blender/source/blender/blenkernel/BKE_unit.h
branches/bmesh/blender/source/blender/blenkernel/BKE_writeffmpeg.h
branches/bmesh/blender/source/blender/blenkernel/BKE_writeframeserver.h
branches/bmesh/blender/source/blender/blenkernel/intern/CCGSubSurf.c
branches/bmesh/blender/source/blender/blenkernel/intern/CCGSubSurf.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/action.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/bmfont.c
branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
branches/bmesh/blender/source/blender/blenkernel/intern/bullet.c
branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/colortools.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/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/blenkernel/intern/effect.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/fmodifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/font.c
branches/bmesh/blender/source/blender/blenkernel/intern/gpencil.c
branches/bmesh/blender/source/blender/blenkernel/intern/icons.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/image_gen.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
branches/bmesh/blender/source/blender/blenkernel/intern/material.c
branches/bmesh/blender/source/blender/blenkernel/intern/mball.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.c
branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/packedFile.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/property.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/script.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
branches/bmesh/blender/source/blender/blenkernel/intern/speaker.c
branches/bmesh/blender/source/blender/blenkernel/intern/text.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenkernel/intern/world.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeavi.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeframeserver.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
branches/bmesh/blender/source/blender/editors/include/ED_keyframing.h
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_navmesh.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/object/object_transform.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/bmesh/blender/source/blender/editors/space_file/filesel.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_info/space_info.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/Converter/KX_IpoConvert.cpp
Added Paths:
-----------
branches/bmesh/blender/po/fa.po
branches/bmesh/blender/release/bin/.blender/locale/fa/
branches/bmesh/blender/release/bin/.blender/locale/fa/LC_MESSAGES/
branches/bmesh/blender/release/bin/.blender/locale/fa/LC_MESSAGES/blender.mo
Removed Paths:
-------------
branches/bmesh/blender/release/bin/.blender/locale/fa/LC_MESSAGES/
branches/bmesh/blender/release/bin/.blender/locale/fa/LC_MESSAGES/blender.mo
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/po/el.po
branches/bmesh/blender/po/ko.po
branches/bmesh/blender/po/ne.po
branches/bmesh/blender/po/zh_TW.po
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40890
+ /trunk/blender:39992-40950
Modified: branches/bmesh/blender/doc/build_systems/cmake.txt
===================================================================
--- branches/bmesh/blender/doc/build_systems/cmake.txt 2011-10-13 22:50:01 UTC
(rev 40996)
+++ branches/bmesh/blender/doc/build_systems/cmake.txt 2011-10-14 01:35:20 UTC
(rev 40997)
@@ -11,7 +11,7 @@
3. Obtaining Dependencies
4. Deciding on a Build Environment
5. Configuring the build for the first time
- 6. Configuring the build after CVS updates
+ 6. Configuring the build after SVN updates
7. Specify alternate Python library versions and locations
@@ -36,7 +36,7 @@
http://www.blender.org/cms/Getting_Dependencies.135.0.html that you
have all dependencies needed for building Blender. Note that for
windows many of these dependencies already come in the lib/windows
- module from CVS.
+ module from SVN.
4. Deciding on a Build Environment
----------------------------------
@@ -47,8 +47,8 @@
have been successfully used to generate build files for the following
environments:
- 1. Microsoft Visual Studio 2005. There is a free version available
- at http://msdn.microsoft.com/vstudio/express/visualc/.
+ 1. Microsoft Visual Studio 2008. There is a free version available
+ at
http://http://www.microsoft.com/visualstudio/en-us/products/2008-editions/express
2. Xcode on Mac OSX
@@ -65,7 +65,7 @@
with different Blender configurations (Audio/NoAudio,
GameEngine/NoGameEngine etc.)
while maintaining a clean source tree. It also makes it possible to
generate files
for different build systems on the same source tree. This also has
benefits for
- general CVS management for the developer as patches and submit logs are
much cleaner.
+ general SVN management for the developer as patches and submit logs are
much cleaner.
Create a directory outside the blender source tree where you would like to
build
Blender (from now on called $BLENDERBUILD). On the commandline you can
then run
@@ -78,27 +78,27 @@
% cd $BLENDERBUILD
% cmake
- ...
- ...
- --version [file] = Show program name/version banner
and exit.
+ ...
+ ...
+ --version [file] = Show program name/version banner and
exit.
- Generators
+ Generators
- The following generators are available on this platform:
- KDevelop3 = Generates KDevelop 3 project
files.
- Unix Makefiles = Generates standard UNIX
makefiles.
- Xcode = Generate XCode project files.
+ The following generators are available on this platform:
+ KDevelop3 = Generates KDevelop 3 project files.
+ Unix Makefiles = Generates standard UNIX makefiles.
+ Xcode = Generate XCode project files.
% cmake -G Xcode $BLENDERSOURCE
- ...
- ...
- -- Configuring blender
- -- Configuring blenderplayer
- -- Configuring done
- -- Generating done
- -- Build files have been written to: $BLENDERBUILD
+ ...
+ ...
+ -- Configuring blender
+ -- Configuring blenderplayer
+ -- Configuring done
+ -- Generating done
+ -- Build files have been written to: $BLENDERBUILD
This will generate the build files with default values. Specific features
can
be enabled or disabled by running the ccmake "GUI" from $BLENDERBUILD as
follows:
@@ -114,15 +114,15 @@
It is also possible to use the commandline of 'cmake' to override certain
of these settings.
- 6. Configuring the build after CVS updates
+ 6. Configuring the build after SVN updates
------------------------------------------
The $BLENDERBUILD directory maintains a file called CMakeCache.txt which
remembers the initial run's settings for subsequent generation runs. After
- every CVS update it may be a good idea to rerun the generation before
building
+ every SVN update it may be a good idea to rerun the generation before
building
Blender again. Just rerun the original 'cmake' run to do this, the settings
will be remembered. For the example above the following will do after every
- 'cvs up':
+ 'svn up':
% cmake -G Xcode $BLENDERSOURCE
@@ -132,9 +132,9 @@
The commandline can be used to override detected/default settings, e.g:
On Unix:
- cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so
-D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles"
../blender
+ cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.2/config/libpython3.2.so
-D PYTHON_INCLUDE_DIR=/usr/local/include/python3.2 ../blender
On Macs:
- cmake -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1
-G Xcode ../blender
+ cmake -D
PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2
-G Xcode ../blender
Mote that this should only be needed once per build directory generation
because it will keep the overrides in CMakeCache.txt for subsequent runs.
@@ -153,4 +153,3 @@
on the various platforms.
/Jacques Beaurain (jbinto)
-
Modified: branches/bmesh/blender/doc/build_systems/scons-dev.txt
===================================================================
--- branches/bmesh/blender/doc/build_systems/scons-dev.txt 2011-10-13
22:50:01 UTC (rev 40996)
+++ branches/bmesh/blender/doc/build_systems/scons-dev.txt 2011-10-14
01:35:20 UTC (rev 40997)
@@ -189,6 +189,6 @@
need changes elsewhere in the system, as it is handled automatically
with the central library repository.
- Enjoy the new system!
+ Enjoy the new system!!
/Nathan Letwory (jesterKing)
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-13
22:50:01 UTC (rev 40996)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-14
01:35:20 UTC (rev 40997)
@@ -1042,7 +1042,9 @@
fw("html_theme = 'blender-org'\n")
fw("html_theme_path = ['../']\n")
- fw("html_favicon = 'favicon.ico'\n")
+ # copied with the theme, exclude else we get an error [#28873]
+ fw("html_favicon = 'favicon.ico'\n")
+
# not helpful since the source us generated, adds to upload size.
fw("html_copy_source = False\n")
fw("\n")
Modified: branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
2011-10-13 22:50:01 UTC (rev 40996)
+++ branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
2011-10-14 01:35:20 UTC (rev 40997)
@@ -1094,9 +1094,11 @@
specs.specs = reader->getSpecs();
int len;
float samplejump = specs.rate / samples_per_second;
- float min, max, power;
+ float min, max, power, overallmax;
bool eos;
+ overallmax = 0;
+
for(int i = 0; i < length; i++)
{
len = floor(samplejump * (i+1)) - floor(samplejump * i);
@@ -1121,6 +1123,11 @@
buffer[i * 3 + 1] = max;
buffer[i * 3 + 2] = sqrt(power) / len;
+ if(overallmax < max)
+ overallmax = max;
+ if(overallmax < -min)
+ overallmax = -min;
+
if(eos)
{
length = i;
@@ -1128,6 +1135,14 @@
}
}
+ if(overallmax > 1.0f)
+ {
+ for(int i = 0; i < length * 3; i++)
+ {
+ buffer[i] /= overallmax;
+ }
+ }
+
return length;
}
Modified: branches/bmesh/blender/po/POTFILES.in
===================================================================
--- branches/bmesh/blender/po/POTFILES.in 2011-10-13 22:50:01 UTC (rev
40996)
+++ branches/bmesh/blender/po/POTFILES.in 2011-10-14 01:35:20 UTC (rev
40997)
@@ -192,27 +192,7 @@
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
-source/blender/makesrna/intern/rna_ID.c
-source/blender/makesrna/intern/rna_action.c
-source/blender/makesrna/intern/rna_color.c
-source/blender/makesrna/intern/rna_constraint.c
-source/blender/makesrna/intern/rna_curve.c
-source/blender/makesrna/intern/rna_fcurve.c
-source/blender/makesrna/intern/rna_material.c
-source/blender/makesrna/intern/rna_mesh.c
-source/blender/makesrna/intern/rna_modifier.c
-source/blender/makesrna/intern/rna_object.c
-source/blender/makesrna/intern/rna_object_force.c
-source/blender/makesrna/intern/rna_particle.c
-source/blender/makesrna/intern/rna_render.c
-source/blender/makesrna/intern/rna_scene.c
-source/blender/makesrna/intern/rna_space.c
-source/blender/makesrna/intern/rna_texture.c
-source/blender/makesrna/intern/rna_ui_api.c
source/blender/makesrna/intern/rna_userdef.c
-source/blender/makesrna/intern/rna_wm.c
-source/blender/makesrna/intern/rna_wm_api.c
-source/blender/makesrna/intern/rna_world.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c
Modified: branches/bmesh/blender/po/README.txt
===================================================================
--- branches/bmesh/blender/po/README.txt 2011-10-13 22:50:01 UTC (rev
40996)
+++ branches/bmesh/blender/po/README.txt 2011-10-14 01:35:20 UTC (rev
40997)
@@ -6,7 +6,7 @@
1. How it works
---------------
-This folder contains source files for translation system. This source files
have
+This folder contains source files for translation system. These source files
have
got .po extension and they've got pretty simple syntax:
msgid "some message id"
@@ -16,9 +16,9 @@
and so it'll be displayed on the screen as "translation for this message".
Pretty simple.
-This source files are pre-compiled into
../relese/bin/.blender/locale/<language>/LC_MESSAGES/blender.mo,
-so they aren't getting compiled every time Blender is compiling to same some
time and prevent
-failure on systems which doesn't have needed tools for compiling .po files.
+This source files are pre-compiled into
../release/bin/.blender/locale/<language>/LC_MESSAGES/blender.mo,
+so they aren't getting compiled every time Blender is compiling to save some
time and prevent
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
