[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14946] branches/cloth/blender: Merging revisions 14838-14945 of https://svn.blender.org/svnroot/ bf-blender/trunk/blender
Daniel Genrich
daniel.genrich at gmx.net
Fri May 23 22:36:05 CEST 2008
Revision: 14946
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14946
Author: genscher
Date: 2008-05-23 22:36:05 +0200 (Fri, 23 May 2008)
Log Message:
-----------
Merging revisions 14838-14945 of https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/cloth/blender/po/fr.po
branches/cloth/blender/release/VERSION
branches/cloth/blender/release/datafiles/splash.jpg
branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py
branches/cloth/blender/release/scripts/flt_export.py
branches/cloth/blender/release/scripts/flt_import.py
branches/cloth/blender/release/scripts/uvcalc_lightmap.py
branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
branches/cloth/blender/source/blender/blenkernel/BKE_mball.h
branches/cloth/blender/source/blender/blenkernel/intern/anim.c
branches/cloth/blender/source/blender/blenkernel/intern/blender.c
branches/cloth/blender/source/blender/blenkernel/intern/curve.c
branches/cloth/blender/source/blender/blenkernel/intern/customdata.c
branches/cloth/blender/source/blender/blenkernel/intern/displist.c
branches/cloth/blender/source/blender/blenkernel/intern/image.c
branches/cloth/blender/source/blender/blenkernel/intern/mball.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/node.c
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/blenkernel/intern/softbody.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/include/butspace.h
branches/cloth/blender/source/blender/makesdna/DNA_object_types.h
branches/cloth/blender/source/blender/makesdna/intern/SConscript
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/cloth/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/cloth/blender/source/blender/python/api2_2x/NLA.c
branches/cloth/blender/source/blender/python/api2_2x/Node.c
branches/cloth/blender/source/blender/python/api2_2x/Window.c
branches/cloth/blender/source/blender/python/api2_2x/doc/API_intro.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Blender.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Mesh.py
branches/cloth/blender/source/blender/python/api2_2x/doc/NLA.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Render.py
branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
branches/cloth/blender/source/blender/render/extern/include/RE_pipeline.h
branches/cloth/blender/source/blender/render/intern/include/render_types.h
branches/cloth/blender/source/blender/render/intern/source/convertblender.c
branches/cloth/blender/source/blender/render/intern/source/envmap.c
branches/cloth/blender/source/blender/render/intern/source/initrender.c
branches/cloth/blender/source/blender/render/intern/source/pipeline.c
branches/cloth/blender/source/blender/render/intern/source/rendercore.c
branches/cloth/blender/source/blender/render/intern/source/renderdatabase.c
branches/cloth/blender/source/blender/render/intern/source/shadeinput.c
branches/cloth/blender/source/blender/render/intern/source/texture.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/buttons_scene.c
branches/cloth/blender/source/blender/src/drawarmature.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/editaction.c
branches/cloth/blender/source/blender/src/editarmature.c
branches/cloth/blender/source/blender/src/editconstraint.c
branches/cloth/blender/source/blender/src/editcurve.c
branches/cloth/blender/source/blender/src/editnode.c
branches/cloth/blender/source/blender/src/editseq.c
branches/cloth/blender/source/blender/src/filesel.c
branches/cloth/blender/source/blender/src/header_image.c
branches/cloth/blender/source/blender/src/interface.c
branches/cloth/blender/source/blender/src/poselib.c
branches/cloth/blender/source/blender/src/sculptmode.c
branches/cloth/blender/source/blender/src/sequence.c
branches/cloth/blender/source/blender/src/space.c
branches/cloth/blender/source/blender/src/splash.jpg.c
branches/cloth/blender/source/blender/src/toolbox.c
branches/cloth/blender/source/blender/src/transform.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_orientations.c
branches/cloth/blender/source/blender/src/view.c
branches/cloth/blender/source/gameengine/Ketsji/KX_GameObject.h
branches/cloth/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/cloth/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/cloth/blender/source/gameengine/SceneGraph/SG_Node.cpp
branches/cloth/blender/source/gameengine/SceneGraph/SG_Node.h
branches/cloth/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
Added Paths:
-----------
branches/cloth/blender/source/gameengine/PyDoc/epy_docgen.sh
Removed Paths:
-------------
branches/cloth/blender/release/scripts/bpymodules/dxfImportObjects.py
branches/cloth/blender/release/text/release_244.txt
branches/cloth/blender/source/gameengine/PyDoc/Makefile
Modified: branches/cloth/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/cloth/blender/po/fr.po
===================================================================
--- branches/cloth/blender/po/fr.po 2008-05-23 20:20:14 UTC (rev 14945)
+++ branches/cloth/blender/po/fr.po 2008-05-23 20:36:05 UTC (rev 14946)
@@ -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/cloth/blender/release/VERSION
===================================================================
--- branches/cloth/blender/release/VERSION 2008-05-23 20:20:14 UTC (rev 14945)
+++ branches/cloth/blender/release/VERSION 2008-05-23 20:36:05 UTC (rev 14946)
@@ -1 +1 @@
-2.44
+2.46
Modified: branches/cloth/blender/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Modified: branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py
===================================================================
--- branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py 2008-05-23 20:20:14 UTC (rev 14945)
+++ branches/cloth/blender/release/scripts/bpymodules/BPyAddMesh.py 2008-05-23 20:36:05 UTC (rev 14946)
@@ -92,11 +92,12 @@
ob_act.loc = cursor
+ me.calcNormals()
+
if is_editmode or Blender.Get('add_editmode'):
EditMode(1)
- else: # adding in object mode means we need to calc normals
- me.calcNormals()
+
Deleted: branches/cloth/blender/release/scripts/bpymodules/dxfImportObjects.py
===================================================================
--- branches/cloth/blender/release/scripts/bpymodules/dxfImportObjects.py 2008-05-23 20:20:14 UTC (rev 14945)
+++ branches/cloth/blender/release/scripts/bpymodules/dxfImportObjects.py 2008-05-23 20:36:05 UTC (rev 14946)
@@ -1,1326 +0,0 @@
-"""This module provides wrapper objects for dxf entities.
-
- The wrappers expect a "dxf object" as input. The dxf object is
- an object with a type and a data attribute. Type is a lowercase
- string matching the 0 code of a dxf entity. Data is a list containing
- dxf objects or lists of [code, data] pairs.
-
- This module is not general, and is only for dxf import.
-"""
-
-# --------------------------------------------------------------------------
-# DXF Import Objects v0.8 by Ed Blake (AKA Kitsu)
-# --------------------------------------------------------------------------
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# ***** END GPL LICENCE BLOCK *****
-# --------------------------------------------------------------------------
-from math import *
-
-
-# from Stani's dxf writer v1.1 (c)www.stani.be (GPL)
-#---color values
-BYBLOCK=0
-BYLAYER=256
-
-#---block-type flags (bit coded values, may be combined):
-ANONYMOUS =1 # This is an anonymous block generated by hatching, associative dimensioning, other internal operations, or an application
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list