[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40912] branches/soc-2011-tomato: Merging r40877 through r40911 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Mon Oct 10 17:24:31 CEST 2011
Revision: 40912
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40912
Author: nazgul
Date: 2011-10-10 15:24:31 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Merging r40877 through r40911 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40877
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40911
Modified Paths:
--------------
branches/soc-2011-tomato/doc/build_systems/cmake.txt
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-tomato/po/fr.po
branches/soc-2011-tomato/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_action.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_anim.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_bullet.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_icons.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_nla.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_suggestions.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_unit.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bmfont.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bullet.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/deform.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/effect.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/property.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/script.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sketch.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/world.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-tomato/source/tests/CMakeLists.txt
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_navmesh.c
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-40876
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40911
Modified: branches/soc-2011-tomato/doc/build_systems/cmake.txt
===================================================================
--- branches/soc-2011-tomato/doc/build_systems/cmake.txt 2011-10-10 14:59:13 UTC (rev 40911)
+++ branches/soc-2011-tomato/doc/build_systems/cmake.txt 2011-10-10 15:24:31 UTC (rev 40912)
@@ -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/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp 2011-10-10 14:59:13 UTC (rev 40911)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp 2011-10-10 15:24:31 UTC (rev 40912)
@@ -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/soc-2011-tomato/po/fr.po
===================================================================
--- branches/soc-2011-tomato/po/fr.po 2011-10-10 14:59:13 UTC (rev 40911)
+++ branches/soc-2011-tomato/po/fr.po 2011-10-10 15:24:31 UTC (rev 40912)
@@ -7354,7 +7354,7 @@
#: bpy.types.KeyMap.is_modal
msgid "Indicates that a keymap is used for translate modal events for an operator"
-msgstr "Indique la touche utilisée pour traduire les évements modaux de l'opérateur"
+msgstr "Indique la touche utilisée pour traduire les événements modaux de l‘opérateur"
#: bpy.types.KeyMap.region_type bpy.types.Region.type
msgid "Region Type"
@@ -13403,15 +13403,15 @@
#: bpy.types.RenderSettings.exr_codec, 'PXR24'
msgid "Pxr24 (lossy)"
-msgstr ""
+msgstr "Pxr24 (destructif)"
#: bpy.types.RenderSettings.exr_codec, 'ZIP'
msgid "ZIP (lossless)"
-msgstr ""
+msgstr "ZIP (non-destructif)"
#: bpy.types.RenderSettings.exr_codec, 'PIZ'
msgid "PIZ (lossless)"
-msgstr ""
+msgstr "PIZ (non-destructif)"
#: bpy.types.RenderSettings.exr_codec, 'RLE'
msgid "RLE (lossless)"
@@ -13424,16 +13424,16 @@
#: bpy.types.RenderSettings.ffmpeg_codec, 'MPEG1'
#: bpy.types.RenderSettings.ffmpeg_format,
msgid "MPEG-1"
-msgstr ""
+msgstr "MPEG-1"
#: bpy.types.RenderSettings.ffmpeg_codec, 'MPEG2'
#: bpy.types.RenderSettings.ffmpeg_format,
msgid "MPEG-2"
-msgstr ""
+msgstr "MPEG-2"
#: bpy.types.RenderSettings.ffmpeg_codec, 'MPEG4'
msgid "MPEG-4(divx)"
-msgstr ""
+msgstr "MPEG-4 (divx)"
#: bpy.types.RenderSettings.ffmpeg_codec, 'HUFFYUV'
msgid "HuffYUV"
@@ -13441,59 +13441,55 @@
#: bpy.types.RenderSettings.ffmpeg_codec, 'DV'
#: bpy.types.RenderSettings.ffmpeg_format,
-#, fuzzy
msgid "DV"
-msgstr "DVar"
+msgstr "DV"
#: bpy.types.RenderSettings.ffmpeg_codec, 'H264'
#: bpy.types.RenderSettings.file_format,
#: bpy.types.RenderSettings.ffmpeg_format,
msgid "H.264"
-msgstr ""
+msgstr "H.264"
#: bpy.types.RenderSettings.ffmpeg_codec, 'THEORA'
msgid "Theora"
-msgstr ""
+msgstr "Theora"
#: bpy.types.RenderSettings.ffmpeg_codec, 'FLASH'
msgid "Flash Video"
-msgstr ""
+msgstr "Flash vidéo"
#: bpy.types.RenderSettings.ffmpeg_codec, 'FFV1'
-#, fuzzy
msgid "FFmpeg video codec #1"
-msgstr "Codec FFMpeg audio à utiliser"
+msgstr "Codec vidéo FFmpeg #1"
#: bpy.types.RenderSettings.use_color_management
#: release/scripts/startup/bl_ui/properties_game.py:354
msgid "Color Management"
msgstr "Gestion des couleurs"
+# Traduction incertaine
#: bpy.types.RenderSettings.use_color_management
-#, fuzzy
msgid "Use linear workflow - gamma corrected imaging pipeline"
msgstr "Utiliser le processus linéaire – pipeline d’image corrigé en gamma"
#: bpy.types.RenderSettings.color_mode
-#, fuzzy
msgid "Choose BW for saving greyscale images, RGB for saving red, green and blue channels, and RGBA for saving red, green, blue and alpha channels"
msgstr "Choisissez BW (N&B) pour enregistrer des images en niveaux de gris, RGB pour enregistrer les canaux rouge, vert et bleu, et RGBA pour enregistrer les canaux rouge, vert, bleu et alpha"
#: bpy.types.RenderSettings.color_mode, 'BW'
#: bpy.types.IMAGE_OT_save_as.color_mode,
-#, fuzzy
msgid "BW"
-msgstr "B"
+msgstr "BW"
#: bpy.types.RenderSettings.color_mode, 'BW'
#: bpy.types.IMAGE_OT_save_as.color_mode,
msgid "Images get saved in 8 bits grayscale (only PNG, JPEG, TGA, TIF)"
-msgstr ""
+msgstr "Les images sont enregistrées en niveau de gris 8 bits (PNG, JPEG, TGA et TIF uniquement)"
#: bpy.types.RenderSettings.color_mode, 'RGB'
#: bpy.types.IMAGE_OT_save_as.color_mode,
msgid "Images are saved with RGB (color) data"
-msgstr ""
+msgstr "Les images sont enregistrées en couleurs (données RGB)"
#: bpy.types.RenderSettings.color_mode, 'RGBA'
#: bpy.types.IMAGE_OT_save_as.color_mode,
@@ -13514,8 +13510,8 @@
msgid "Crop to Border"
msgstr "Découper aux bords"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list