[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14563] branches/fluidcontrol: svn merge -r 14505:14561 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Sun Apr 27 19:23:06 CEST 2008
Revision: 14563
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14563
Author: genscher
Date: 2008-04-27 19:22:57 +0200 (Sun, 27 Apr 2008)
Log Message:
-----------
svn merge -r 14505:14561 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/fluidcontrol/CMakeLists.txt
branches/fluidcontrol/bin/.blender/.Blanguages
branches/fluidcontrol/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp
branches/fluidcontrol/po/uk.po
branches/fluidcontrol/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blender.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
branches/fluidcontrol/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/fluidcontrol/release/datafiles/datatoc.c
branches/fluidcontrol/release/scripts/DirectX8Exporter.py
branches/fluidcontrol/release/scripts/ac3d_export.py
branches/fluidcontrol/release/scripts/ac3d_import.py
branches/fluidcontrol/release/scripts/bevel_center.py
branches/fluidcontrol/release/scripts/collada_export.py
branches/fluidcontrol/release/scripts/collada_import.py
branches/fluidcontrol/release/scripts/config.py
branches/fluidcontrol/release/scripts/console.py
branches/fluidcontrol/release/scripts/envelope_symmetry.py
branches/fluidcontrol/release/scripts/export_lightwave_motion.py
branches/fluidcontrol/release/scripts/faceselect_same_weights.py
branches/fluidcontrol/release/scripts/flt_export.py
branches/fluidcontrol/release/scripts/flt_import.py
branches/fluidcontrol/release/scripts/flt_palettemanager.py
branches/fluidcontrol/release/scripts/flt_toolbar.py
branches/fluidcontrol/release/scripts/help_browser.py
branches/fluidcontrol/release/scripts/help_getting_started.py
branches/fluidcontrol/release/scripts/help_manual.py
branches/fluidcontrol/release/scripts/help_release_notes.py
branches/fluidcontrol/release/scripts/help_tutorials.py
branches/fluidcontrol/release/scripts/help_web_blender.py
branches/fluidcontrol/release/scripts/help_web_devcomm.py
branches/fluidcontrol/release/scripts/help_web_eshop.py
branches/fluidcontrol/release/scripts/help_web_usercomm.py
branches/fluidcontrol/release/scripts/image_edit.py
branches/fluidcontrol/release/scripts/import_lightwave_motion.py
branches/fluidcontrol/release/scripts/lightwave_export.py
branches/fluidcontrol/release/scripts/md2_export.py
branches/fluidcontrol/release/scripts/md2_import.py
branches/fluidcontrol/release/scripts/mesh_boneweight_copy.py
branches/fluidcontrol/release/scripts/mesh_cleanup.py
branches/fluidcontrol/release/scripts/mesh_edges2curves.py
branches/fluidcontrol/release/scripts/mesh_mirror_tool.py
branches/fluidcontrol/release/scripts/mesh_poly_reduce.py
branches/fluidcontrol/release/scripts/obdatacopier.py
branches/fluidcontrol/release/scripts/object_apply_def.py
branches/fluidcontrol/release/scripts/object_batch_name_edit.py
branches/fluidcontrol/release/scripts/off_export.py
branches/fluidcontrol/release/scripts/off_import.py
branches/fluidcontrol/release/scripts/paths_import.py
branches/fluidcontrol/release/scripts/raw_export.py
branches/fluidcontrol/release/scripts/raw_import.py
branches/fluidcontrol/release/scripts/renameobjectbyblock.py
branches/fluidcontrol/release/scripts/render_save_layers.py
branches/fluidcontrol/release/scripts/rvk1_torvk2.py
branches/fluidcontrol/release/scripts/save_theme.py
branches/fluidcontrol/release/scripts/scripttemplate_object_edit.py
branches/fluidcontrol/release/scripts/slp_import.py
branches/fluidcontrol/release/scripts/sysinfo.py
branches/fluidcontrol/release/scripts/unweld.py
branches/fluidcontrol/release/scripts/uv_from_adjacent.py
branches/fluidcontrol/release/scripts/uvcalc_follow_active_coords.py
branches/fluidcontrol/release/scripts/uvcalc_lightmap.py
branches/fluidcontrol/release/scripts/uvcalc_quad_clickproj.py
branches/fluidcontrol/release/scripts/uvcalc_smart_project.py
branches/fluidcontrol/release/scripts/uvcopy.py
branches/fluidcontrol/release/scripts/vertexpaint_gradient.py
branches/fluidcontrol/release/scripts/vertexpaint_selfshadow_ao.py
branches/fluidcontrol/release/scripts/vrml97_export.py
branches/fluidcontrol/release/scripts/weightpaint_clean.py
branches/fluidcontrol/release/scripts/weightpaint_gradient.py
branches/fluidcontrol/release/scripts/weightpaint_grow_shrink.py
branches/fluidcontrol/release/scripts/weightpaint_normalize.py
branches/fluidcontrol/release/scripts/widgetwizard.py
branches/fluidcontrol/release/scripts/xfig_export.py
branches/fluidcontrol/release/scripts/xsi_export.py
branches/fluidcontrol/source/blender/blenkernel/BKE_font.h
branches/fluidcontrol/source/blender/blenkernel/intern/action.c
branches/fluidcontrol/source/blender/blenkernel/intern/blender.c
branches/fluidcontrol/source/blender/blenkernel/intern/collision.c
branches/fluidcontrol/source/blender/blenkernel/intern/depsgraph.c
branches/fluidcontrol/source/blender/blenkernel/intern/font.c
branches/fluidcontrol/source/blender/blenkernel/intern/image.c
branches/fluidcontrol/source/blender/blenkernel/intern/modifier.c
branches/fluidcontrol/source/blender/blenkernel/intern/object.c
branches/fluidcontrol/source/blender/blenkernel/intern/pointcache.c
branches/fluidcontrol/source/blender/blenkernel/intern/text.c
branches/fluidcontrol/source/blender/blenkernel/intern/writeffmpeg.c
branches/fluidcontrol/source/blender/blenlib/BLI_blenlib.h
branches/fluidcontrol/source/blender/blenlib/BLI_bpath.h
branches/fluidcontrol/source/blender/blenlib/intern/bpath.c
branches/fluidcontrol/source/blender/blenlib/intern/util.c
branches/fluidcontrol/source/blender/blenpluginapi/iff.h
branches/fluidcontrol/source/blender/ftfont/intern/FTF_TTFont.cpp
branches/fluidcontrol/source/blender/imbuf/intern/util.c
branches/fluidcontrol/source/blender/include/BSE_sequence.h
branches/fluidcontrol/source/blender/include/blendef.h
branches/fluidcontrol/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/fluidcontrol/source/blender/python/BPY_extern.h
branches/fluidcontrol/source/blender/python/BPY_interface.c
branches/fluidcontrol/source/blender/python/api2_2x/Blender.c
branches/fluidcontrol/source/blender/python/api2_2x/Node.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/API_related.py
branches/fluidcontrol/source/blender/python/api2_2x/sceneSequence.c
branches/fluidcontrol/source/blender/render/intern/source/convertblender.c
branches/fluidcontrol/source/blender/src/buttons_object.c
branches/fluidcontrol/source/blender/src/buttons_scene.c
branches/fluidcontrol/source/blender/src/editfont.c
branches/fluidcontrol/source/blender/src/editobject.c
branches/fluidcontrol/source/blender/src/editscreen.c
branches/fluidcontrol/source/blender/src/header_script.c
branches/fluidcontrol/source/blender/src/headerbuttons.c
branches/fluidcontrol/source/blender/src/meshtools.c
branches/fluidcontrol/source/blender/src/seqeffects.c
branches/fluidcontrol/source/blender/src/toets.c
branches/fluidcontrol/source/blender/src/transform_conversions.c
branches/fluidcontrol/source/blender/src/usiblender.c
branches/fluidcontrol/source/creator/CMakeLists.txt
branches/fluidcontrol/source/creator/creator.c
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IActuator.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IObject.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_IObject.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_Scene.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/fluidcontrol/source/gameengine/Physics/Sumo/Fuzzics/include/SM_Callback.h
Added Paths:
-----------
branches/fluidcontrol/release/scripts/scripttemplate_camer_object.py
branches/fluidcontrol/release/scripts/scripttemplate_ipo_gen.py
branches/fluidcontrol/release/scripts/scripttemplate_metaball_create.py
Modified: branches/fluidcontrol/CMakeLists.txt
===================================================================
--- branches/fluidcontrol/CMakeLists.txt 2008-04-27 17:00:22 UTC (rev 14562)
+++ branches/fluidcontrol/CMakeLists.txt 2008-04-27 17:22:57 UTC (rev 14563)
@@ -258,7 +258,7 @@
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
+ SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
@@ -299,7 +299,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ")
+ SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32)
IF(APPLE)
Modified: branches/fluidcontrol/bin/.blender/.Blanguages
===================================================================
--- branches/fluidcontrol/bin/.blender/.Blanguages 2008-04-27 17:00:22 UTC (rev 14562)
+++ branches/fluidcontrol/bin/.blender/.Blanguages 2008-04-27 17:22:57 UTC (rev 14563)
@@ -14,7 +14,7 @@
Russian:ru_RU
Croatian:hr_HR
Serbian:sr
-Ukrainian:uk
+Ukrainian:uk_UA
Polish:pl_PL
Romanian:ro
Arabic:ar
Modified: branches/fluidcontrol/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp 2008-04-27 17:00:22 UTC (rev 14562)
+++ branches/fluidcontrol/intern/ghost/intern/GHOST_SystemX11.cpp 2008-04-27 17:22:57 UTC (rev 14563)
@@ -46,6 +46,7 @@
#include <X11/Xatom.h>
#include <X11/keysym.h>
+#include <X11/XKBlib.h> /* allow detectable autorepeate */
#ifdef __sgi
@@ -111,6 +112,18 @@
}
m_start_time = GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000);
+
+
+ /* use detectable autorepeate, mac and windows also do this */
+ int use_xkb;
+ int xkb_opcode, xkb_event, xkb_error;
+ int xkb_major = XkbMajorVersion, xkb_minor = XkbMinorVersion;
+
+ use_xkb = XkbQueryExtension(m_display, &xkb_opcode, &xkb_event, &xkb_error, &xkb_major, &xkb_minor);
+ if (use_xkb) {
+ XkbSetDetectableAutoRepeat(m_display, true, NULL);
+ }
+
}
GHOST_TSuccess
Modified: branches/fluidcontrol/po/uk.po
===================================================================
--- branches/fluidcontrol/po/uk.po 2008-04-27 17:00:22 UTC (rev 14562)
+++ branches/fluidcontrol/po/uk.po 2008-04-27 17:22:57 UTC (rev 14563)
@@ -1,51 +1,42 @@
# Ukrainian translation for blender
# This file is distributed under the same license as the blender package.
-# Serhij Dubyk <dubyk at library.lviv.ua>, 2006.
+# Serhij Dubyk <serhijdubyk at gmail.com>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: blender\n"
-"POT-Creation-Date: 2006-03-27 13:42+0200\n"
-"PO-Revision-Date: 2007-01-30 12:54+0200\n"
-"Last-Translator: Serhij Dubyk <dubyk at library.lviv.ua>\n"
+"Project-Id-Version: blender246\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2008-04-06 18:48+0300\n"
+"Last-Translator: Serhij Dubyk <serhijdubyk at gmail.com>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.0.2\n"
"X-Poedit-Language: Ukrainian\n"
"X-Poedit-Country: UKRAINE\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Rosetta-Export-Date: 2007-01-29 06:40+0000\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#, fuzzy
-msgid " - sys evt"
-msgstr " Системні змінні"
-
msgid "Global Undo History "
-msgstr "Глобальна історія відмін "
+msgstr "Історія відміни"
-msgid "-1W "
-msgstr "-1W "
-
msgid "DataBrowse "
msgstr "Перегляд даних "
msgid "blendfile"
msgstr ""
-# ##########################################################
msgid "[Bone Dict: {"
msgstr ""
-msgid "}]\n"
-msgstr ""
-
msgid "Grid"
msgstr "Сітка"
msgid "Outside"
msgstr "Зовні"
-# ##########################################################
msgid "[Pose Bone Dict: {"
msgstr ""
@@ -55,17 +46,21 @@
msgid "Can't edit library data"
msgstr "Неможливо редагувати бібліотечні дані"
+#, fuzzy
msgid "New material"
-msgstr "Новий матеріал"
+msgstr "Матеріал"
+#, fuzzy
msgid "Delete material index"
-msgstr "Видалити покажчик матеріалу"
+msgstr "Вилучити індекс матеріалу"
+#, fuzzy
msgid "Assign material index"
-msgstr "Привласнити індекс матеріалу"
+msgstr "Додати новий індекс Матеріалу"
+#, fuzzy
msgid "Select material index"
-msgstr "Вибрати покажчик матеріалу"
+msgstr "Вилучити індекс матеріалу"
msgid "Set Smooth"
msgstr "Пригладжено"
@@ -87,53 +82,54 @@
msgstr "Розглядати усі пригладжені грані з кутами менше, ніж Degr: як 'згладжені' при промальовці."
msgid "Degr:"
-msgstr "Град:"
+msgstr ""
msgid "Defines maximum angle between face normals that 'Auto Smooth' will operate on"
msgstr "Визначає максимальний кут між нормалями граней для яких 'авто згладжування' працюватиме"
+#, fuzzy
msgid "VertCol"
-msgstr "КолірВершин"
+msgstr "Колір вершини"
msgid "Make"
msgstr "Зробити"
-msgid "Enables vertex colour painting on active Mesh"
-msgstr "Дозволяє промалювання кольорових вершин на активному об'єкті"
+msgid "Enables vertex color painting on active Mesh"
+msgstr ""
msgid "Delete"
-msgstr "Видалити"
+msgstr "Вилучити"
-msgid "Deletes vertex colours on active Mesh"
-msgstr "Видаляє кольори вершин на активному об'єкті"
+msgid "Deletes vertex colors on active Mesh"
+msgstr ""
#, fuzzy
msgid "TexFace"
-msgstr "Ткстр Грнь"
+msgstr "Ткстр Прстр"
-#, fuzzy
msgid "Enables the active Mesh's faces for UV coordinate mapping"
-msgstr "Дозволяє UV-текстурування для граней активного об'єкту"
+msgstr ""
msgid "Deletes UV coordinates for active Mesh's faces"
-msgstr "Видаляє UV-координати у граней активного об'єкту"
+msgstr ""
+#, fuzzy
msgid "Sticky"
-msgstr "Липучка"
+msgstr "Статично"
#, fuzzy
msgid "Creates Sticky coordinates for the active Mesh from the current camera view background picture"
-msgstr "Створити липкі координати для активного обє'кта від фонової картинки поточної камери вигляду"
+msgstr "Створює липкі координати для активного об'єкта від фонової картинки з вигляду поточної камери"
msgid "Deletes Sticky texture coordinates"
-msgstr "Видалити липкі текстуровані координати"
+msgstr ""
msgid "Slurph:"
msgstr ""
#, fuzzy
msgid "Relative Keys"
-msgstr "Относитключи"
+msgstr "Відносключи"
#, fuzzy
msgid "SlowerDraw"
@@ -141,14 +137,14 @@
#, fuzzy
msgid "Displays the active object with all possible edges shown"
-msgstr "Показувати активний обє'кт промальовував всі ребра"
+msgstr "Показувати активний об'єкт промальовував всі ребра"
msgid "FasterDraw"
msgstr "Швидке промалювання"
#, fuzzy
msgid "Displays the active object faster by omitting some edges when drawing"
-msgstr "Показувати активний обє'кт швидше, не промальовував деякі ребра"
+msgstr "Показувати активний об'єкт швидше, не промальовував деякі ребра"
msgid "Centre"
msgstr "Центр"
@@ -157,19 +153,20 @@
msgid "Shifts object data to be centered about object's origin"
msgstr "Зрушити Данниє обє'кта туди де знаходиться origin обє'кта"
+#, fuzzy
msgid "Centre New"
-msgstr "Новий центр"
+msgstr "Центр Новий"
#, fuzzy
msgid "Shifts object's origin to center of object data"
-msgstr "Зрушити origin обє'кта туди де центр Даних обє'кта"
+msgstr "Зрушити Данниє обє'кта туди де знаходиться origin обє'кта"
+#, fuzzy
msgid "Centre Cursor"
-msgstr "Центрувати по курсору"
+msgstr "Центр Курсор"
-#, fuzzy
msgid "Shifts object's origin to cursor location"
-msgstr "Зрушити origin обє'кта туди де знаходиться курсор"
+msgstr ""
msgid "Double Sided"
msgstr "Двосторонньо"
@@ -177,258 +174,285 @@
msgid "Render/display the mesh as double or single sided"
msgstr "Відображає поверхню як двосторонню або односторонню"
-#, fuzzy
msgid "No V.Normal Flip"
-msgstr "Не <> нормалі вершин"
+msgstr ""
msgid "Disables flipping of vertexnormals during render"
-msgstr "Відключити переворот нормалей вершин під час промальовки"
+msgstr ""
+#, fuzzy
msgid "Add modifier"
msgstr "Дод. модифікатор"
+#, fuzzy
msgid "Del modifier"
-msgstr "Видалити модифікатор"
+msgstr "Модифікатори"
+#, fuzzy
msgid "Move modifier"
-msgstr "Пересунути модифікатор"
+msgstr "Модифікатори"
+#, fuzzy
msgid "Modifier is not first"
-msgstr "Модифікатор - не перший"
+msgstr "Модифікатори"
msgid "Applying will delete mesh UVs and vertex colors"
-msgstr "Фіксація видалить UV координати об'єкту та кольори вершин"
+msgstr ""
msgid "Apply will only change CV points, not tesselated/bevel vertices"
-msgstr "Фіксація змінить тільки контрольні точки (CV), але не змінить вершини, отримані методами ділення/скіс (tesselatе/bevel)"
+msgstr ""
+#, fuzzy
msgid "Apply modifier"
-msgstr "Зафіксувати модифікатор"
+msgstr "Дод. модифікатор"
+#, fuzzy
msgid "Copy modifier"
-msgstr "Копіювати модифікатор"
+msgstr "Дод. модифікатор"
+#, fuzzy
msgid "Clear hook"
-msgstr "Очистити гачок (hook)"
+msgstr "Очистити почало"
msgid "Hook cursor center"
msgstr ""
-#, fuzzy
msgid "Modifier convert to real"
-msgstr "код клавіші модифікатора"
+msgstr ""
msgid "Collapse/Expand Modifier"
-msgstr "Згорнути/розгорнути модифікатор"
+msgstr ""
+#, fuzzy
msgid "Modifier name"
-msgstr "Назва модифікатора"
+msgstr "Модифікатори"
+#, fuzzy
msgid "Make Real"
-msgstr "Зробити реальним"
+msgstr "Зробити Мета"
msgid "Convert virtual modifier to a real modifier"
-msgstr "Зробити віртуальний модифікатор реальним"
+msgstr ""
+#, fuzzy
msgid "Enable modifier during rendering"
-msgstr "Активувати модифікатор лише під час промальовки"
+msgstr "Задіяти матеріал для промальовки радіозіті"
msgid "Enable modifier during interactive display"
-msgstr "Активувати модифікатор тільки в 3d-вікні"
+msgstr ""
msgid "Enable modifier during Editmode (only if enabled for display)"
-msgstr "Активувати модифікатор в режимі редагування об'єкту (тільки якщо активований для 3d-вікна)"
+msgstr ""
msgid "Apply modifier to editing cage during Editmode"
-msgstr "Зафіксувати модифікатор для редагування гратки"
+msgstr ""
msgid "Move modifier up in stack"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list