[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14200] branches/ndof: update to trunk r14199
JLuc Peuriere
jlp at nerim.net
Fri Mar 21 18:00:40 CET 2008
Revision: 14200
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14200
Author: lukep
Date: 2008-03-21 18:00:40 +0100 (Fri, 21 Mar 2008)
Log Message:
-----------
update to trunk r14199
Modified Paths:
--------------
branches/ndof/SConstruct
branches/ndof/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/ndof/extern/ffmpeg/SConscript
branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ndof/intern/guardedalloc/intern/mallocn.c
branches/ndof/po/it.po
branches/ndof/release/scripts/flt_defaultp.py
branches/ndof/release/scripts/flt_import.py
branches/ndof/release/scripts/flt_toolbar.py
branches/ndof/source/blender/blenkernel/BKE_bad_level_calls.h
branches/ndof/source/blender/blenkernel/BKE_bmesh.h
branches/ndof/source/blender/blenkernel/BKE_collision.h
branches/ndof/source/blender/blenkernel/BKE_particle.h
branches/ndof/source/blender/blenkernel/BKE_sculpt.h
branches/ndof/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/ndof/source/blender/blenkernel/intern/CCGSubSurf.c
branches/ndof/source/blender/blenkernel/intern/action.c
branches/ndof/source/blender/blenkernel/intern/armature.c
branches/ndof/source/blender/blenkernel/intern/cloth.c
branches/ndof/source/blender/blenkernel/intern/collision.c
branches/ndof/source/blender/blenkernel/intern/curve.c
branches/ndof/source/blender/blenkernel/intern/implicit.c
branches/ndof/source/blender/blenkernel/intern/kdop.c
branches/ndof/source/blender/blenkernel/intern/material.c
branches/ndof/source/blender/blenkernel/intern/mesh.c
branches/ndof/source/blender/blenkernel/intern/modifier.c
branches/ndof/source/blender/blenkernel/intern/node.c
branches/ndof/source/blender/blenkernel/intern/particle.c
branches/ndof/source/blender/blenkernel/intern/particle_system.c
branches/ndof/source/blender/blenkernel/intern/script.c
branches/ndof/source/blender/blenkernel/intern/texture.c
branches/ndof/source/blender/blenlib/BLI_arithb.h
branches/ndof/source/blender/blenlib/intern/BLI_storage.h
branches/ndof/source/blender/blenlib/intern/arithb.c
branches/ndof/source/blender/blenlib/intern/threads.c
branches/ndof/source/blender/blenloader/BLO_readfile.h
branches/ndof/source/blender/blenloader/intern/readfile.c
branches/ndof/source/blender/blenloader/intern/writefile.c
branches/ndof/source/blender/imbuf/intern/tiff.c
branches/ndof/source/blender/include/BIF_transform.h
branches/ndof/source/blender/include/BSE_drawview.h
branches/ndof/source/blender/include/BSE_edit.h
branches/ndof/source/blender/makesdna/DNA_cloth_types.h
branches/ndof/source/blender/makesdna/DNA_modifier_types.h
branches/ndof/source/blender/makesdna/DNA_node_types.h
branches/ndof/source/blender/makesdna/DNA_scene_types.h
branches/ndof/source/blender/makesdna/DNA_view3d_types.h
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/ndof/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
branches/ndof/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/ndof/source/blender/python/BPY_extern.h
branches/ndof/source/blender/python/BPY_interface.c
branches/ndof/source/blender/python/api2_2x/Blender.c
branches/ndof/source/blender/python/api2_2x/Constraint.c
branches/ndof/source/blender/python/api2_2x/Draw.c
branches/ndof/source/blender/python/api2_2x/Library.c
branches/ndof/source/blender/python/api2_2x/Mesh.c
branches/ndof/source/blender/python/api2_2x/Node.c
branches/ndof/source/blender/python/api2_2x/Node.h
branches/ndof/source/blender/python/api2_2x/SurfNurb.c
branches/ndof/source/blender/python/api2_2x/Window.c
branches/ndof/source/blender/python/api2_2x/doc/Constraint.py
branches/ndof/source/blender/python/api2_2x/doc/Curve.py
branches/ndof/source/blender/python/api2_2x/doc/IpoCurve.py
branches/ndof/source/blender/python/api2_2x/doc/Mesh.py
branches/ndof/source/blender/python/api2_2x/doc/Render.py
branches/ndof/source/blender/python/api2_2x/sceneRender.c
branches/ndof/source/blender/radiosity/intern/source/radrender.c
branches/ndof/source/blender/render/intern/include/render_types.h
branches/ndof/source/blender/render/intern/include/rendercore.h
branches/ndof/source/blender/render/intern/source/convertblender.c
branches/ndof/source/blender/render/intern/source/rayshade.c
branches/ndof/source/blender/render/intern/source/shadeinput.c
branches/ndof/source/blender/render/intern/source/texture.c
branches/ndof/source/blender/src/butspace.c
branches/ndof/source/blender/src/buttons_editing.c
branches/ndof/source/blender/src/buttons_object.c
branches/ndof/source/blender/src/drawaction.c
branches/ndof/source/blender/src/drawipo.c
branches/ndof/source/blender/src/drawnode.c
branches/ndof/source/blender/src/drawobject.c
branches/ndof/source/blender/src/drawtext.c
branches/ndof/source/blender/src/drawview.c
branches/ndof/source/blender/src/edit.c
branches/ndof/source/blender/src/editaction.c
branches/ndof/source/blender/src/editarmature.c
branches/ndof/source/blender/src/editipo.c
branches/ndof/source/blender/src/editmesh_loop.c
branches/ndof/source/blender/src/editnode.c
branches/ndof/source/blender/src/editobject.c
branches/ndof/source/blender/src/editseq.c
branches/ndof/source/blender/src/editview.c
branches/ndof/source/blender/src/header_action.c
branches/ndof/source/blender/src/header_image.c
branches/ndof/source/blender/src/header_view3d.c
branches/ndof/source/blender/src/headerbuttons.c
branches/ndof/source/blender/src/imagepaint.c
branches/ndof/source/blender/src/interface_panel.c
branches/ndof/source/blender/src/meshtools.c
branches/ndof/source/blender/src/sculptmode.c
branches/ndof/source/blender/src/seqaudio.c
branches/ndof/source/blender/src/seqeffects.c
branches/ndof/source/blender/src/space.c
branches/ndof/source/blender/src/transform.c
branches/ndof/source/blender/src/transform_orientations.c
branches/ndof/source/blender/src/view.c
branches/ndof/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ndof/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/ndof/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ndof/source/gameengine/Ketsji/KX_GameObject.h
branches/ndof/source/nan_compile.mk
branches/ndof/source/nan_link.mk
branches/ndof/tools/btools.py
Modified: branches/ndof/SConstruct
===================================================================
--- branches/ndof/SConstruct 2008-03-21 16:27:43 UTC (rev 14199)
+++ branches/ndof/SConstruct 2008-03-21 17:00:40 UTC (rev 14200)
@@ -286,7 +286,7 @@
# default is new quieter output, but if you need to see the
# commands, do 'scons BF_QUIET=0'
bf_quietoutput = B.arguments.get('BF_QUIET', '1')
-if bf_quietoutput=='1':
+if env['BF_QUIET']:
B.set_quiet_output(env)
else:
if toolset=='msvc':
Modified: branches/ndof/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/ndof/extern/ffmpeg/SConscript
===================================================================
--- branches/ndof/extern/ffmpeg/SConscript 2008-03-21 16:27:43 UTC (rev 14199)
+++ branches/ndof/extern/ffmpeg/SConscript 2008-03-21 17:00:40 UTC (rev 14200)
@@ -123,7 +123,11 @@
sources = list(Set(objs.split()))
sources = [lib + "/" + x for x in sources]
- defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
+ if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
+ defs = "HAVE_AV_CONFIG_H _ISOC9X_SOURCE"
+ print "passing switch"
+ else :
+ defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
cflags = ""
if "CFLAGS" in vars:
Modified: branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp 2008-03-21 16:27:43 UTC (rev 14199)
+++ branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp 2008-03-21 17:00:40 UTC (rev 14200)
@@ -976,7 +976,7 @@
Primary_atom = XInternAtom(m_display, "CLIPBOARD", False);
owner = XGetSelectionOwner(m_display, Primary_atom);
if (owner == m_window) {
- data = (unsigned char*) malloc(strlen(txt_cut_buffer));
+ data = (unsigned char*) malloc(strlen(txt_cut_buffer)+1);
strcpy((char*)data, txt_cut_buffer);
return (GHOST_TUns8*)data;
} else if (owner == None) {
@@ -986,7 +986,7 @@
Primary_atom = XInternAtom(m_display, "PRIMARY", False);
owner = XGetSelectionOwner(m_display, Primary_atom);
if (owner == m_window) {
- data = (unsigned char*) malloc(strlen(txt_select_buffer));
+ data = (unsigned char*) malloc(strlen(txt_select_buffer)+1);
strcpy((char*)data, txt_select_buffer);
return (GHOST_TUns8*)data;
} else if (owner == None) {
@@ -1007,10 +1007,12 @@
XNextEvent(m_display, &xevent);
if(xevent.type == SelectionNotify) {
if(XGetWindowProperty(m_display, m_window, xevent.xselection.property, 0L, 4096L, False, AnyPropertyType, &rtype, &bits, &len, &bytes, &data) == Success) {
- tmp_data = (unsigned char*) malloc(strlen((char*)data));
- strcpy((char*)tmp_data, (char*)data);
- XFree(data);
- return (GHOST_TUns8*)tmp_data;
+ if (data) {
+ tmp_data = (unsigned char*) malloc(strlen((char*)data)+1);
+ strcpy((char*)tmp_data, (char*)data);
+ XFree(data);
+ return (GHOST_TUns8*)tmp_data;
+ }
}
return NULL;
}
@@ -1031,13 +1033,13 @@
Primary_atom = XInternAtom(m_display, "CLIPBOARD", False);
if(txt_cut_buffer) { free((void*)txt_cut_buffer); }
- txt_cut_buffer = (char*) malloc(strlen(buffer));
+ txt_cut_buffer = (char*) malloc(strlen(buffer)+1);
strcpy(txt_cut_buffer, buffer);
} else {
Primary_atom = XInternAtom(m_display, "PRIMARY", False);
if(txt_select_buffer) { free((void*)txt_select_buffer); }
- txt_select_buffer = (char*) malloc(strlen(buffer));
+ txt_select_buffer = (char*) malloc(strlen(buffer)+1);
strcpy(txt_select_buffer, buffer);
}
Modified: branches/ndof/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/ndof/intern/guardedalloc/intern/mallocn.c 2008-03-21 16:27:43 UTC (rev 14199)
+++ branches/ndof/intern/guardedalloc/intern/mallocn.c 2008-03-21 17:00:40 UTC (rev 14200)
@@ -114,8 +114,8 @@
volatile int totblock= 0;
volatile unsigned long mem_in_use= 0, mmap_in_use= 0;
-volatile static struct localListBase _membase;
-volatile static struct localListBase *membase = &_membase;
+static volatile struct localListBase _membase;
+static volatile struct localListBase *membase = &_membase;
static void (*error_callback)(char *) = NULL;
static void (*thread_lock_callback)(void) = NULL;
static void (*thread_unlock_callback)(void) = NULL;
Modified: branches/ndof/po/it.po
===================================================================
--- branches/ndof/po/it.po 2008-03-21 16:27:43 UTC (rev 14199)
+++ branches/ndof/po/it.po 2008-03-21 17:00:40 UTC (rev 14200)
@@ -1,7 +1,5 @@
# Italian translation for blender
#
-#msgid ""
-#msgstr ""
#"Project-Id-Version: it-246\n"
#"POT-Creation-Date: \n"
#"PO-Revision-Date: 2008-02-29 21:39+0100\n"
@@ -311,7 +309,7 @@
msgstr "Limite Unione:"
msgid "Distance from axis within which mirrored vertices are merged"
-msgstr "Distanza da asse da dove i vertici e i riflessi vengono uniti"
+msgstr "Distanza da assi a dove i vertici riflessi si uniscono"
msgid "Specify the axis to mirror about"
msgstr "Specifica su quale asse fare la specchiatura"
@@ -320,7 +318,7 @@
msgstr "Taglia"
msgid "Prevents during Transform vertices to go through Mirror"
-msgstr "Evita durante la Trasformazione i vertici che superano lo specchio"
+msgstr "Evita durante la Trasformazione che i vertici superano il Mirror"
msgid "Ratio:"
msgstr "Rapporto:"
@@ -428,7 +426,7 @@
msgstr "Ricalcola e cancella l'offset (trasformazione) del gancio"
msgid "Recenter"
-msgstr "Rincentra"
+msgstr "Ricentra"
msgid "Sets hook center to cursor position"
msgstr "Imposta il centro del gancio dalla posizione del cursore"
@@ -6281,7 +6279,7 @@
msgstr "Imposta la dimensione del buffer delle ombre"
msgid "Sets the radius of the lightsource, 0 is same as pointlight"
-msgstr "Imposta il raggio della sorgente di luce, 0 = a punto luce"
+msgstr "Imposta il raggio della sorgente di luce, 0 = punto luce"
msgid "Sets the distance value at which light intensity is half"
msgstr "Imposta la distanza alla quale l'intensità della luce é dimezzata"
@@ -6464,7 +6462,7 @@
msgstr "Fà si che la texture deformi la superfice"
msgid "Sets the amount the texture displaces the surface"
-msgstr "Stabilisce quanto la texture deforma la superfice"
+msgstr "Stabilisce di quanto la texture deforma la superfice"
msgid "Let the texture warp texture coordinates of next channels"
msgstr "Consenti alla texture di influenzare le coordinate della texture sui canali successivi"
@@ -6668,7 +6666,7 @@
msgstr "Abilita lunghezza d'onda del jittering, aggiunge rumore"
msgid "Renders material as a halo"
-msgstr "Restituisce il materiali come un alone"
+msgstr "Restituisce il materiali con un alone"
msgid "HaloSize: "
msgstr "DimAlone: "
@@ -6887,16 +6885,16 @@
msgstr "Visualizza Rampe Colore"
msgid "Show ramp buttons for material diffuse color"
-msgstr "Visualizza bottoni rampe per colore diffuso del materiale"
+msgstr "Visualizza bottoni rampa per colore diffuso del materiale"
msgid "Show Spec Ramp"
msgstr "Visualizza Rampe Spec"
msgid "Show ramp buttons for material specular color"
-msgstr "Visualizza bottoni rampe per colore speculare del materiale"
+msgstr "Visualizza bottoni rampa per colore speculare del materiale"
msgid "Toggles colorband ramp operations"
-msgstr "Abilita/Disabilita operazioni rampe banda colore"
+msgstr "Abilita/Disabilita operazioni rampa banda colore"
msgid "Factor"
msgstr "Fattore"
@@ -6938,7 +6936,7 @@
msgstr "Chiaro "
msgid "Blending method for Ramp (uses alpha in Colorband)"
-msgstr "Metodo per la sfumatura delle rampe (usa trasparenza nelle banda colore)"
+msgstr "Metodo per la sfumatura della rampa (usa trasparenza nelle banda colore)"
msgid "Blending factor (also uses alpha in Colorband)"
msgstr "Fattore sfumatura (usa trasparenza nelle banda colore)"
@@ -10253,7 +10251,7 @@
msgstr "Punto"
msgid "Can't change because of pinned data"
-msgstr "Impossibile cambiare perché dati bloccati"
+msgstr "Impossibile cambiare : dati bloccati"
msgid "Sets Ipo to be included in an Action or not"
msgstr "Imposta l'Ipo per essere inclusa in una Azione o no"
@@ -12971,7 +12969,7 @@
msgstr "Specchio asse-X"
msgid "While using transforms, mirrors the transformation"
-msgstr "Rispecchia la trasformazione mentre trasformi"
+msgstr "Rifletti la trasformazione mentre trasformi"
msgid "Empty Display:"
msgstr "Visualizza Empty:"
@@ -13076,7 +13074,7 @@
msgstr "Mostra opzioni proprietà confine"
msgid "Obstacle causes zero normal and tangential velocity (=sticky). Default for all. Only option for moving objects."
-msgstr "L'ostacolo causa l'azzeramento della velocità normale e tangenziale (=viscoso).Prefissato per tutto.Solo opzione per oggetti in movimento."
+msgstr "L'ostacolo causa l'azzeramento della velocità normale e tangenziale (=viscoso).Prefissato per tutto.Opzione solo per oggetti in movimento."
msgid "Mix between no-slip and free-slip. Non moving objects only!"
msgstr "Mixa tra antiscivolo e scivoloso. Solo oggetti non in movimento!"
@@ -13211,7 +13209,7 @@
msgstr "Render del cielo o backbuffer in questo livello"
msgid "Render Edge-enhance in this Layer (only works for Solid faces)"
-msgstr "Migliora i bordi nel render in questo livello (funziona solo per facce solide)"
+msgstr "Migliora i bordi nel render in questo livello (funziona solo con facce solide)"
msgid "Render Solid faces in this Layer"
msgstr "Render delle facce solide in questo livello"
@@ -15659,7 +15657,7 @@
msgstr "Calcola l'itinerario dalla testa dell'osso invece che dalla coda"
msgid "(Re)calculates the paths of the selected bones"
-msgstr "(Re)Calcola il percorso delle ossa selezionate"
+msgstr "(Ri)Calcola il percorso delle ossa selezionate"
msgid "Clears all bone paths"
msgstr "Cancella tutti i percorsi ossa"
@@ -16268,7 +16266,7 @@
msgstr "<Auto collisione> non disponibile perché"
msgid "are no edges, enable <Use Edges>"
-msgstr "Non ci sono lati, abilita <Use Edges (Usa Bordi)>"
+msgstr "Non ci sono bordi, abilita <Use Edges (Usa Bordi)>"
msgid "Makes this object visible to other softbody objects"
msgstr "Rende questo oggetto visibile ad altri oggetti softbody"
Modified: branches/ndof/release/scripts/flt_defaultp.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list