[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40572] branches/soc-2011-tomato: Merging trunk up to revision 40571
Sergey Sharybin
g.ulairi at gmail.com
Mon Sep 26 17:00:23 CEST 2011
Revision: 40572
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40572
Author: nazgul
Date: 2011-09-26 15:00:23 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Merging trunk up to revision 40571
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40571
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/doc/python_api/rst/change_log.rst
branches/soc-2011-tomato/intern/elbeem/intern/solver_relax.h
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/po/fr.po
branches/soc-2011-tomato/po/ja.po
branches/soc-2011-tomato/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-tomato/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/__init__.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
branches/soc-2011-tomato/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenfont/SConscript
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_translation.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/interface/SConscript
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_python.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/util/undo.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/makesrna/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/python/SConscript
branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-tomato/source/blender/windowmanager/SConscript
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/SConscript
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
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-40540
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40571
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-09-26 14:49:24 UTC (rev 40571)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-09-26 15:00:23 UTC (rev 40572)
@@ -1272,7 +1272,10 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
+
+ # # this causes too many warnings, disable
+ # ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
+
# disable because it gives warnings for printf() & friends.
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1280,8 +1283,10 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+ # # this causes too many warnings, disable
+ # ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2011-09-26 14:49:24 UTC (rev 40571)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2011-09-26 15:00:23 UTC (rev 40572)
@@ -482,7 +482,7 @@
if(${_out_version_char_empty})
set(BLENDER_VERSION_CHAR_INDEX "0")
else()
- set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
+ set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w x y z)
list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
unset(_char_ls)
Modified: branches/soc-2011-tomato/doc/python_api/rst/change_log.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/change_log.rst 2011-09-26 14:49:24 UTC (rev 40571)
+++ branches/soc-2011-tomato/doc/python_api/rst/change_log.rst 2011-09-26 15:00:23 UTC (rev 40572)
@@ -1396,7 +1396,7 @@
* **hide** -> :class:`bpy.types.Material.game_settings.invisible`
* **use_collision** -> :class:`bpy.types.Material.game_settings.physics`
* **use_light** -> :class:`bpy.types.Material.game_settings.use_shadeless`
-* **use_twoside** -> :class:`bpy.types.Material.game_settings.back_culling`
+* **use_twoside** -> :class:`bpy.types.Material.game_settings.backface_culling`
* **use_bitmap_text** -> :class:`bpy.types.Material.game_settings.text`
* **blend_type** -> :class:`bpy.types.Material.game_settings.alpha_blend`
* **use_alpha_sort** -> :class:`bpy.types.Material.game_settings.alpha_blend`
Modified: branches/soc-2011-tomato/intern/elbeem/intern/solver_relax.h
===================================================================
--- branches/soc-2011-tomato/intern/elbeem/intern/solver_relax.h 2011-09-26 14:49:24 UTC (rev 40571)
+++ branches/soc-2011-tomato/intern/elbeem/intern/solver_relax.h 2011-09-26 15:00:23 UTC (rev 40572)
@@ -390,7 +390,7 @@
#define DEFAULT_STREAM \
m[dC] = RAC(ccel,dC); \
\
- if(!(nbored & CFBnd)) { \
+ if((!nbored & CFBnd)) { \
\
m[dN ] = CSRC_N ; m[dS ] = CSRC_S ; \
m[dE ] = CSRC_E ; m[dW ] = CSRC_W ; \
Modified: branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c 2011-09-26 14:49:24 UTC (rev 40571)
+++ branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c 2011-09-26 15:00:23 UTC (rev 40572)
@@ -711,6 +711,10 @@
static void MemorY_ErroR(const char *block, const char *error)
{
print_error("Memoryblock %s: %s\n",block, error);
+
+#ifdef WITH_ASSERT_ABORT
+ abort();
+#endif
}
static const char *check_memlist(MemHead *memh)
Modified: branches/soc-2011-tomato/po/fr.po
===================================================================
--- branches/soc-2011-tomato/po/fr.po 2011-09-26 14:49:24 UTC (rev 40571)
+++ branches/soc-2011-tomato/po/fr.po 2011-09-26 15:00:23 UTC (rev 40572)
@@ -10117,6 +10117,7 @@
msgstr "Groupe partagé"
#: source/blender/editors/armature/poseobject.c:689
+#, fuzzy
msgid "All bones affected by active Keying Set"
msgstr "Tous les os affectés par l’ensemble de clés actif"
@@ -24428,1160 +24429,1090 @@
msgid "Sets the audio channel count"
msgstr "Nombre de canaux audio"
-# #############################################################################
-# ######### MARKER
-# #############################################################################
-
-
-
#: source/blender/makesrna/intern/rna_scene.c:2530
+#, fuzzy
msgid "Framerate, expressed in frames per second"
-msgstr ""
+msgstr "Framerate, exprimé en images par seconde"
#: source/blender/makesrna/intern/rna_scene.c:2537
+#, fuzzy
msgid "FPS Base"
-msgstr ""
+msgstr "Base de FPS"
#: source/blender/makesrna/intern/rna_scene.c:2537
#, fuzzy
msgid "Framerate base"
-msgstr "Images"
+msgstr "Base de framerate"
#: source/blender/makesrna/intern/rna_scene.c:2545
#, fuzzy
msgid "Frame Map Old"
-msgstr "Image"
+msgstr "Image conversion départ"
#: source/blender/makesrna/intern/rna_scene.c:2545
+#, fuzzy
msgid "Specify old mapping value in frames"
-msgstr ""
+msgstr "Valeur de départ de la conversion, en images"
#: source/blender/makesrna/intern/rna_scene.c:2552
#, fuzzy
msgid "Frame Map New"
-msgstr "Image"
+msgstr "Image conversion nouvelle"
#: source/blender/makesrna/intern/rna_scene.c:2552
msgid "Specify how many frames the Map Old will last"
-msgstr ""
+msgstr "Combien d’images durera Image conversion départ"
#: source/blender/makesrna/intern/rna_scene.c:2559
+#, fuzzy
msgid "Dither Intensity"
-msgstr ""
+msgstr "Intensité du dithering"
#: source/blender/makesrna/intern/rna_scene.c:2559
+#, fuzzy
msgid ""
"Amount of dithering noise added to the rendered image to break up banding"
msgstr ""
+"Quantité de bruit de dithering ajouté à l’image rendue pour casser le tramage"
#: source/blender/makesrna/intern/rna_scene.c:2565
-#, fuzzy
msgid "Pixel Filter"
-msgstr "Traduire les bulles d'aide"
+msgstr "Filtre de pixel"
#: source/blender/makesrna/intern/rna_scene.c:2565
msgid "Reconstruction filter used for combining anti-aliasing samples"
-msgstr ""
+msgstr "Filtre de reconstruction utilisé pour combiner les échantillons d’antialiasing"
#: source/blender/makesrna/intern/rna_scene.c:2571
-#, fuzzy
msgid "Filter Size"
-msgstr "Masque les fichiers précés d'un ."
+msgstr "Taille du filtre"
#: source/blender/makesrna/intern/rna_scene.c:2571
+#, fuzzy
msgid "Pixel width over which the reconstruction filter combines samples"
-msgstr ""
+msgstr "Nombre de pixels sur lesquels se base le filtre de reconstruction pour combiner les échantillons"
#: source/blender/makesrna/intern/rna_scene.c:2577
-#, fuzzy
msgid "Alpha Mode"
-msgstr "Par-dessous (Alpha)"
+msgstr "Mode alpha"
#: source/blender/makesrna/intern/rna_scene.c:2577
msgid "Representation of alpha information in the RGBA pixels"
-msgstr ""
+msgstr "Représentation de l’information alpha dans les pixels RGBA"
#: source/blender/makesrna/intern/rna_scene.c:2583
-#, fuzzy
msgid "Octree Resolution"
-msgstr "Sélection des données"
+msgstr "Résolution de l’octree"
#: source/blender/makesrna/intern/rna_scene.c:2583
msgid ""
"Resolution of raytrace accelerator. Use higher resolutions for larger scenes"
msgstr ""
+"Résolution de l’accélérateur de raytracing, utilisez de plus hautes résolutions pour de plus grandes scènes"
#: source/blender/makesrna/intern/rna_scene.c:2589
msgid "Raytrace Acceleration Structure"
-msgstr ""
+msgstr "Structure accélératrice de raytracing"
#: source/blender/makesrna/intern/rna_scene.c:2589
msgid "Type of raytrace accelerator structure"
-msgstr ""
+msgstr "Type de structure accélératrice de raytracing"
#: source/blender/makesrna/intern/rna_scene.c:2594
-#, fuzzy
msgid "Use Instances"
-msgstr "Groupes de Sommets"
+msgstr "Utiliser instances"
#: source/blender/makesrna/intern/rna_scene.c:2594
+#, fuzzy
msgid ""
"Instance support leads to effective memory reduction when using duplicates"
msgstr ""
+"Le support des instances permet de réduire fortement les besoins en mémoire, quand des copies sont utilisées"
#: source/blender/makesrna/intern/rna_scene.c:2599
msgid "Use Local Coords"
-msgstr ""
+msgstr "Utiliser coordonnées locales"
#: source/blender/makesrna/intern/rna_scene.c:2599
msgid ""
"Vertex coordinates are stored localy on each primitive. Increases memory "
"usage, but may have impact on speed"
msgstr ""
+"Les coordonnées des vertices sont stockées localement dans chaque primitive (augmente les besoins en mémoire mais peut avoir un impact sur la vitesse)"
#: source/blender/makesrna/intern/rna_scene.c:2604
msgid "Render and combine multiple samples per pixel to prevent jagged edges"
-msgstr ""
+msgstr "Rendre et combiner plusieurs échantillons par pixel, pour éviter les arêtes à effet d’escalier"
#: source/blender/makesrna/intern/rna_scene.c:2610
msgid "Anti-Aliasing Samples"
-msgstr ""
+msgstr "Échantillons d’antialiasing"
#: source/blender/makesrna/intern/rna_scene.c:2610
msgid "Amount of anti-aliasing samples per pixel"
-msgstr ""
+msgstr "Nombre d’échantillons d’antialiasing par pixel"
#: source/blender/makesrna/intern/rna_scene.c:2615
msgid "Render image to two fields per frame, for interlaced TV output"
-msgstr ""
+msgstr "Rendre l’image dans deux trames par image, pour une sortie entrelacée (TV)"
#: source/blender/makesrna/intern/rna_scene.c:2621
msgid "Field Order"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list