[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14901] branches/soc-2008-unclezeiv: svn merge -r 14832:14900 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Tue May 20 02:10:44 CEST 2008
Revision: 14901
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14901
Author: unclezeiv
Date: 2008-05-20 02:10:42 +0200 (Tue, 20 May 2008)
Log Message:
-----------
svn merge -r 14832:14900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2008-unclezeiv/po/fr.po
branches/soc-2008-unclezeiv/release/VERSION
branches/soc-2008-unclezeiv/release/datafiles/splash.jpg
branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyAddMesh.py
branches/soc-2008-unclezeiv/release/scripts/flt_export.py
branches/soc-2008-unclezeiv/release/scripts/flt_import.py
branches/soc-2008-unclezeiv/release/scripts/uvcalc_lightmap.py
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_mball.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/curve.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/displist.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/image.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/mball.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/node.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
branches/soc-2008-unclezeiv/source/blender/include/butspace.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/intern/SConscript
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Node.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/API_intro.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Blender.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Mesh.py
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Render.py
branches/soc-2008-unclezeiv/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/render_types.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/initrender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pipeline.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/rendercore.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/renderdatabase.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
branches/soc-2008-unclezeiv/source/blender/src/editarmature.c
branches/soc-2008-unclezeiv/source/blender/src/editcurve.c
branches/soc-2008-unclezeiv/source/blender/src/editnode.c
branches/soc-2008-unclezeiv/source/blender/src/filesel.c
branches/soc-2008-unclezeiv/source/blender/src/header_ipo.c
branches/soc-2008-unclezeiv/source/blender/src/header_nla.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/interface.c
branches/soc-2008-unclezeiv/source/blender/src/poselib.c
branches/soc-2008-unclezeiv/source/blender/src/sculptmode.c
branches/soc-2008-unclezeiv/source/blender/src/sequence.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/splash.jpg.c
branches/soc-2008-unclezeiv/source/blender/src/toolbox.c
branches/soc-2008-unclezeiv/source/blender/src/transform.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/SceneGraph/SG_Node.cpp
branches/soc-2008-unclezeiv/source/gameengine/SceneGraph/SG_Node.h
branches/soc-2008-unclezeiv/source/gameengine/SceneGraph/SG_ParentRelation.h
Added Paths:
-----------
branches/soc-2008-unclezeiv/release/text/release_246.txt
Removed Paths:
-------------
branches/soc-2008-unclezeiv/release/text/release_244.txt
Modified: branches/soc-2008-unclezeiv/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/po/fr.po
===================================================================
--- branches/soc-2008-unclezeiv/po/fr.po 2008-05-20 00:01:14 UTC (rev 14900)
+++ branches/soc-2008-unclezeiv/po/fr.po 2008-05-20 00:10:42 UTC (rev 14901)
@@ -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/soc-2008-unclezeiv/release/VERSION
===================================================================
--- branches/soc-2008-unclezeiv/release/VERSION 2008-05-20 00:01:14 UTC (rev 14900)
+++ branches/soc-2008-unclezeiv/release/VERSION 2008-05-20 00:10:42 UTC (rev 14901)
@@ -1 +1 @@
-2.44
+2.46
Modified: branches/soc-2008-unclezeiv/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Modified: branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyAddMesh.py
===================================================================
--- branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyAddMesh.py 2008-05-20 00:01:14 UTC (rev 14900)
+++ branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyAddMesh.py 2008-05-20 00:10:42 UTC (rev 14901)
@@ -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()
+
Modified: branches/soc-2008-unclezeiv/release/scripts/flt_export.py
===================================================================
--- branches/soc-2008-unclezeiv/release/scripts/flt_export.py 2008-05-20 00:01:14 UTC (rev 14900)
+++ branches/soc-2008-unclezeiv/release/scripts/flt_export.py 2008-05-20 00:10:42 UTC (rev 14901)
@@ -44,6 +44,8 @@
from flt_filewalker import FileFinder
from flt_properties import *
import shutil
+import trace
+import sys
FF = FileFinder()
records = process_recordDefs()
@@ -639,20 +641,37 @@
#first pass: do open faces
for vert in wireverts:
if not visited[vert] and vertuse[vert.index][1] == 1:
- visited[vert] = True
- loop = [vert]
- othervert = edge_get_othervert(vert, disk[vert][0])
- self.vertwalk(othervert, loop, disk, visited)
+ loop = list()
+ done = 0
+ startvert = vert
+ while not done:
+ done = 1
+ visited[startvert] = True
+ loop.append(startvert)
+ for edge in disk[startvert]:
+ othervert = edge_get_othervert(startvert, edge)
+ if not visited[othervert]:
+ done = 0
+ startvert = othervert
+ break
if len(loop) > 2: loops.append( ('Open', loop) )
-
for vert in wireverts:
if not visited[vert]:
- visited[vert] = True
- loop = [vert]
- othervert = edge_get_othervert(vert,disk[vert][0])
- self.vertwalk(othervert, loop, disk, visited)
+ loop = list()
+ done = 0
+ startvert = vert
+ while not done:
+ done = 1
+ visited[startvert] = True
+ loop.append(startvert)
+ for edge in disk[startvert]:
+ othervert = edge_get_othervert(startvert,edge)
+ if not visited[othervert]:
+ done = 0
+ startvert = othervert
+ break
if len(loop) > 2: loops.append( ('closed', loop) )
-
+
#now go through the loops and append.
for l in loops:
(ftype, loop) = l
@@ -666,6 +685,8 @@
face_desc.color_index = 227
self.face_lst.append(face_desc)
+
+
def sortFLTFaces(self,a,b):
aindex = a.getProperty("FLT_ORIGINDEX")
bindex = b.getProperty("FLT_ORIGINDEX")
@@ -1441,6 +1462,9 @@
FLTAttrib = None
+
+FLTWarn = None
+
def setshadingangle(ID,val):
global options
options.state['shading_default'] = val
@@ -1504,6 +1528,8 @@
global FLTAttrib
+ global FLTWarn
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list