[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14899] branches/apricot: Apricot Branch: svn merge -r 14875:HEAD
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon May 19 20:41:13 CEST 2008
Revision: 14899
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14899
Author: blendix
Date: 2008-05-19 20:41:13 +0200 (Mon, 19 May 2008)
Log Message:
-----------
Apricot Branch: svn merge -r 14875:HEAD
Modified Paths:
--------------
branches/apricot/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/apricot/po/fr.po
branches/apricot/release/VERSION
branches/apricot/release/datafiles/splash.jpg
branches/apricot/source/blender/blenkernel/BKE_blender.h
branches/apricot/source/blender/blenkernel/intern/curve.c
branches/apricot/source/blender/blenkernel/intern/displist.c
branches/apricot/source/blender/blenkernel/intern/image.c
branches/apricot/source/blender/blenkernel/intern/mball.c
branches/apricot/source/blender/python/api2_2x/doc/API_intro.py
branches/apricot/source/blender/python/api2_2x/doc/Blender.py
branches/apricot/source/blender/python/api2_2x/doc/Mesh.py
branches/apricot/source/blender/python/api2_2x/doc/Render.py
branches/apricot/source/blender/src/buttons_editing.c
branches/apricot/source/blender/src/editcurve.c
branches/apricot/source/blender/src/editnode.c
branches/apricot/source/blender/src/interface.c
branches/apricot/source/blender/src/poselib.c
branches/apricot/source/blender/src/sequence.c
branches/apricot/source/blender/src/splash.jpg.c
branches/apricot/source/blender/src/view.c
Added Paths:
-----------
branches/apricot/release/text/release_246.txt
Removed Paths:
-------------
branches/apricot/release/text/release_244.txt
Modified: branches/apricot/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/apricot/po/fr.po
===================================================================
--- branches/apricot/po/fr.po 2008-05-19 18:37:31 UTC (rev 14898)
+++ branches/apricot/po/fr.po 2008-05-19 18:41:13 UTC (rev 14899)
@@ -31,6 +31,7 @@
### Menubar Mode
### Menubar Draw type
### Menubar Pivot
+### Menubar Transform Manipulator
### Menubar Snap
### Menubar Edit Mode
### Menubar MESH
@@ -364,6 +365,13 @@
msgid "Append or Link (Image Browser)"
msgstr "Importer/Lier depuis un .blend (Vignettes)"
+#file select panel
+msgid "Append"
+msgstr "Copier"
+
+msgid "Active Layer"
+msgstr "Calque Actif"
+
msgid "Import"
msgstr "Importer"
@@ -510,7 +518,7 @@
msgstr "Type de Rendu"
msgid "Full Render"
-msgstr "Rendu final"
+msgstr "Rendu Complet"
msgid "Ambient Occlusion"
msgstr "Occlusion Ambiante"
@@ -519,7 +527,7 @@
msgstr "Normales"
msgid "Texture Only"
-msgstr "Textures seulement"
+msgstr "Textures"
msgid "No Images found to bake to"
msgstr "Aucune Image UV trouvée"
@@ -719,6 +727,13 @@
msgid "Render Preview..."
msgstr "Rendu Interactif"
+msgid "Transform Orientations..."
+msgstr "Axes de Transformation..."
+
+#window
+msgid "Transform Orientations"
+msgstr "Axes de Transformation"
+
msgid "Zoom Within Border..."
msgstr "Zoom par Cadre..."
@@ -858,8 +873,8 @@
msgid "Copy Attributes"
msgstr "Copier les Propriétés"
-msgid "Object Constaints"
-msgstr "Contraintes Objet"
+msgid "Object Constraints"
+msgstr "Contraintes"
msgid "Location"
msgstr "Position"
@@ -867,6 +882,12 @@
msgid "Size"
msgstr "Echelle"
+msgid "Make Local"
+msgstr "Dé-Lier d'un fichier ext."
+
+msgid "Selected Objects and Data"
+msgstr "Objets et Données Sélectionnés"
+
msgid "Make Single User"
msgstr "Dé-Lier"
@@ -879,6 +900,9 @@
msgid "Materials"
msgstr "Matériaux"
+msgid "To Scene..."
+msgstr "Vers Scène..."
+
msgid "Mesh Data"
msgstr "Données"
@@ -898,10 +922,10 @@
msgstr "Accrochage"
msgid "Snap Closest"
-msgstr "Accrochage Distance"
+msgstr "Accrochage au plus Proche"
msgid "Snap Center"
-msgstr "Accrochage Centre"
+msgstr "Accrochage au Centre"
msgid "Selection -> Grid"
msgstr "Sélection -> Grille"
@@ -1062,13 +1086,35 @@
###########################################################
###
+### Menubar Transform Manipulator
+###
+###########################################################
+
+msgid "Use 3d transform manipulator (Ctrl Space)"
+msgstr "Affiche le repère de transformation (Ctrl Espace)"
+
+msgid "Orientation"
+msgstr "Axes:"
+
+msgid "Toggles Layer visibility (Num, Shift Num)"
+msgstr "Calques à afficher, Shift-clic pour en afficher plusieurs (Num, Shift Num)"
+
+###########################################################
+###
### Menubar Snap
###
###########################################################
msgid "Closest"
-msgstr "Distance"
+msgstr "Proche"
+#tips
+msgid "Snap while Ctrl is held during transform (Shift Tab)"
+msgstr "Accrochage aux Sommets en maintenant Ctrl appuyé (Shift Tab)"
+
+msgid "Use Snap or Grid (Shift Tab)"
+msgstr "Accrochage à la Grille en maintenant Ctrl appuyé(Shift Tab)"
+
###########################################################
###
### Menubar Edit Mode
@@ -1146,7 +1192,10 @@
msgid "Proportional Editing"
msgstr "Edition Proportionnelle"
+msgid "Flip Triangle Edges"
+msgstr "Modifier Triangulation"
+
###########################################################
###
### SPACE MENU: ADD
@@ -1339,8 +1388,11 @@
msgid "Separate"
msgstr "Séparer en Nouvel Objet"
+msgid "Separate "
+msgstr "Séparer en Nouvel Objet"
+
msgid "Split"
-msgstr "Séparer"
+msgstr "Séparer les Sommets"
msgid "Recalculate Outside"
msgstr "Recalculer à l'Extérieur"
@@ -1404,7 +1456,7 @@
msgstr "Fusionner"
msgid "Bevel"
-msgstr "Chanfrain"
+msgstr "Chanfrein"
msgid "Loop Subdivide"
msgstr "Coupe Circulaire"
@@ -2306,20 +2358,20 @@
msgstr "Créer"
msgid "Center"
-msgstr "Centrer"
+msgstr "Centre"
msgid "Center New"
-msgstr "Reset Centre"
+msgstr "Maillage"
msgid "Center Cursor"
-msgstr "Centre au Curseur"
+msgstr "Centre > Curseur"
#tip
msgid "Shifts object data to be centered about object's origin"
msgstr "Décale les données de l'objet pour qu'elles soient centrées sur l'origine de l'objet"
msgid "Double Sided"
-msgstr "Doubles Faces"
+msgstr "Faces Doubles"
#tip
msgid "Render/display the mesh as double or single sided"
@@ -2361,7 +2413,7 @@
msgstr "Copier"
msgid "Rem Doubles"
-msgstr "Suppr Doubles"
+msgstr "Supp Doubles"
msgid "Flip Normals"
msgstr "Inv Normales"
@@ -2372,6 +2424,9 @@
msgid "Draw Normals"
msgstr "Afficher Normales"
+msgid "Draw VNormals"
+msgstr "Afficher VNormales"
+
msgid "Draw Edges"
msgstr "Afficher Arêtes"
@@ -2396,7 +2451,7 @@
msgstr "Afficher Angles"
msgid "Face Area"
-msgstr "Afficher Aires"
+msgstr "Afficher Surfaces"
msgid "Mesh Tools"
msgstr "Outils Maillage"
@@ -2458,6 +2513,9 @@
msgid "Screw"
msgstr "Visser"
+msgid "Join Triangles"
+msgstr "Tirangles > Quads"
+
msgid "Shapes"
msgstr "Mémoire de Formes"
@@ -2654,11 +2712,17 @@
msgstr "Arête"
msgid "Edge Settings"
-msgstr "Arête Param"
+msgstr "Paramètres"
msgid "Output"
msgstr "Sortie"
+msgid "No Overwrite"
+msgstr "Ne Pas Écraser"
+
+msgid "Disable Tex"
+msgstr "Sans Textures"
+
msgid "Render Display "
msgstr "Affichage du Rendu"
@@ -2689,7 +2753,7 @@
msgstr "Calques:"
msgid "Combined"
-msgstr "RGBA Combinés"
+msgstr "RGB/A"
# Panneau Render
msgid "OSA"
@@ -2699,11 +2763,14 @@
msgstr "Active l'Anticrénelage"
msgid "RENDER"
-msgstr "RENDU"
+msgstr "Rendu Image Simple"
msgid "Shadow"
msgstr "Ombres"
+msgid "SS"
+msgstr "SSS"
+
msgid "Sky"
msgstr "Ciel"
@@ -2746,7 +2813,7 @@
msgstr "Rendu vers Textures"
msgid "BAKE"
-msgstr "Calculer"
+msgstr "Rendu vers Textures"
# Panneau Format
msgid "Size preset: Image size - 720x576, Aspect ratio - 54x51, 25 fps"
@@ -2864,6 +2931,17 @@
msgid "Use sample clock for syncing animation to audio"
msgstr "Utilise une horloge pour respecter la vitesse d'animation"
+# Panneau Sound
+msgid "Sound"
+msgstr "Son"
+
+msgid "Sequencer"
+msgstr "Séquenceur"
+
+msgid "Audio sequencer settings"
+msgstr "Paramètres du séquenceur audio"
+
+
###########################################################
###
### SECTION TEXT EDITOR
@@ -3623,9 +3701,6 @@
###
###########################################################
-msgid "Separate "
-msgstr "Séparer"
-
msgid "Selected"
msgstr "Sélection"
@@ -3698,7 +3773,7 @@
msgstr "Subdiviser (Adoucir)"
msgid "Bevel "
-msgstr "Chanfrain"
+msgstr "Chanfrein"
###########################################################
###
@@ -4002,9 +4077,12 @@
###
###########################################################
-msgid "Clear Parent"
+msgid "Clear Parent "
msgstr "Supprimer Parenté"
+msgid "Clear and Keep Transformation (Clear Track) "
+msgstr "Supprimer Parenté mais Garder les Transformations"
+
###########################################################
###
### Menu Make Links (CTRL-L)
Modified: branches/apricot/release/VERSION
===================================================================
--- branches/apricot/release/VERSION 2008-05-19 18:37:31 UTC (rev 14898)
+++ branches/apricot/release/VERSION 2008-05-19 18:41:13 UTC (rev 14899)
@@ -1 +1 @@
-2.44
+2.46
Modified: branches/apricot/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Deleted: branches/apricot/release/text/release_244.txt
===================================================================
--- branches/apricot/release/text/release_244.txt 2008-05-19 18:37:31 UTC (rev 14898)
+++ branches/apricot/release/text/release_244.txt 2008-05-19 18:41:13 UTC (rev 14899)
@@ -1,13 +0,0 @@
-------------------------- Blender 2.44 release ----------------
-
-May 2007
-
-This is the upgrade release of 2.43, with mostly bugfixes and a couple
-of nice new features, among which 64 bits safety and SSS render.
-
-For html versions of release logs, with images and examples, please check:
-http://www.blender.org
-
-Have fun!
-
-The blender.org team.
Copied: branches/apricot/release/text/release_246.txt (from rev 14898, trunk/blender/release/text/release_246.txt)
===================================================================
--- branches/apricot/release/text/release_246.txt (rev 0)
+++ branches/apricot/release/text/release_246.txt 2008-05-19 18:41:13 UTC (rev 14899)
@@ -0,0 +1,13 @@
+------------------------- Blender 2.46 release ----------------
+
+May 2008
+
+This is the release of version 2.46, the result of 9 months of development,
+including everything as used to render the open movie Big Buck Bunny.
+
+For html versions of release logs, with images and examples, please check:
+http://www.blender.org
+
+Have fun!
+
+The blender.org team.
Modified: branches/apricot/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_blender.h 2008-05-19 18:37:31 UTC (rev 14898)
+++ branches/apricot/source/blender/blenkernel/BKE_blender.h 2008-05-19 18:41:13 UTC (rev 14899)
@@ -40,11 +40,11 @@
struct ListBase;
struct MemFile;
-#define BLENDER_VERSION 245
-#define BLENDER_SUBVERSION 17
+#define BLENDER_VERSION 246
+#define BLENDER_SUBVERSION 0
-#define BLENDER_MINVERSION 240
-#define BLENDER_MINSUBVERSION 0
+#define BLENDER_MINVERSION 245
+#define BLENDER_MINSUBVERSION 15
int BKE_read_file(char *dir, void *type_r);
int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r);
Modified: branches/apricot/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/curve.c 2008-05-19 18:37:31 UTC (rev 14898)
+++ branches/apricot/source/blender/blenkernel/intern/curve.c 2008-05-19 18:41:13 UTC (rev 14899)
@@ -583,7 +583,7 @@
/* this is for float inaccuracy */
if(t < knots[0]) t= knots[0];
- else if(t > knots[opp2]) t= knots[opp2]; /* Valgrind reports an error here, use a nurbs torus and change u/v res to reproduce a crash TODO*/
+ else if(t > knots[opp2]) t= knots[opp2];
/* this part is order '1' */
o2 = order + 1;
@@ -1476,7 +1476,9 @@
else nu= cu->nurb.first;
while(nu) {
- if(nu->pntsu<=1) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list