[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40493] branches/bmesh/blender: svn merge ^/trunk/blender -r40432:40491
Campbell Barton
ideasman42 at gmail.com
Fri Sep 23 15:04:02 CEST 2011
Revision: 40493
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40493
Author: campbellbarton
Date: 2011-09-23 13:04:01 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40432:40491
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40432
Modified Paths:
--------------
branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
branches/bmesh/blender/build_files/cmake/cmake_static_check_sparse.py
branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py
branches/bmesh/blender/build_files/cmake/project_source_info.py
branches/bmesh/blender/doc/manpage/blender.1
branches/bmesh/blender/intern/elbeem/intern/loop_tools.h
branches/bmesh/blender/po/fr.po
branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py
branches/bmesh/blender/release/scripts/startup/bl_operators/__init__.py
branches/bmesh/blender/release/scripts/startup/bl_operators/mesh.py
branches/bmesh/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/bmesh/blender/release/scripts/startup/bl_operators/sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_console.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_draw.c
branches/bmesh/blender/source/blender/editors/space_action/action_ops.c
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_header.c
branches/bmesh/blender/source/blender/editors/space_node/node_ops.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tree.c
branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_navmesh.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_warp.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/bmesh/blender/source/blender/python/SConscript
branches/bmesh/blender/source/blender/python/generic/CMakeLists.txt
branches/bmesh/blender/source/blender/python/generic/blf_py_api.c
branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/render/intern/source/voxeldata.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
Added Paths:
-----------
branches/bmesh/blender/release/scripts/modules/bpy_extras/anim_utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py
branches/bmesh/blender/release/scripts/startup/bl_operators/console.py
branches/bmesh/blender/release/scripts/startup/bl_operators/view3d.py
Removed Paths:
-------------
branches/bmesh/blender/release/scripts/startup/bl_operators/nla.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40432
+ /trunk/blender:39992-40492
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -5,7 +5,7 @@
# Python configuration
BF_PYTHON_VERSION = '3.2'
BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -5,7 +5,7 @@
# Python configuration
BF_PYTHON_VERSION = '3.2'
BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -5,7 +5,7 @@
# Python configuration
BF_PYTHON_VERSION = '3.2'
BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -5,7 +5,7 @@
# Python configuration
BF_PYTHON_VERSION = '3.2'
BF_PYTHON_ABI_FLAGS = 'mu'
-BF_PYTHON = '/opt/python3.2'
+BF_PYTHON = '/opt/python3'
WITH_BF_STATICPYTHON = True
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -37,7 +37,7 @@
CHECKER_ARGS = [
# not sure why this is needed, but it is.
- "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern/glew/include"),
+ "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
# "--check-config", # when includes are missing
# "--enable=all", # if you want sixty hundred pedantic suggestions
@@ -58,20 +58,22 @@
check_commands.append((c, cmd))
- for i, (c, cmd) in enumerate(check_commands):
+
+ process_functions = []
+ def my_process(i, c, cmd):
percent = 100.0 * (i / (len(check_commands) - 1))
percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
- # if percent < 27.9:
- # continue
-
- # let cppcheck finish the line off...
+ sys.stdout.flush()
sys.stdout.write("%s " % percent_str)
- sys.stdout.flush()
- process = subprocess.Popen(cmd)
- process.wait()
+ return subprocess.Popen(cmd)
+ for i, (c, cmd) in enumerate(check_commands):
+ process_functions.append((my_process, (i, c, cmd)))
+ project_source_info.queue_processes(process_functions)
+
+
if __name__ == "__main__":
main()
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_sparse.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_sparse.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -52,15 +52,21 @@
check_commands.append((c, cmd))
- for i, (c, cmd) in enumerate(check_commands):
+ def my_process(i, c, cmd):
percent = 100.0 * (i / (len(check_commands) - 1))
percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+ sys.stdout.flush()
sys.stdout.write("%s %s\n" % (percent_str, c))
- sys.stdout.flush()
- process = subprocess.Popen(cmd)
- process.wait()
+ return subprocess.Popen(cmd)
+ process_functions = []
+ for i, (c, cmd) in enumerate(check_commands):
+ process_functions.append((my_process, (i, c, cmd)))
+
+ project_source_info.queue_processes(process_functions)
+
+
if __name__ == "__main__":
main()
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -84,15 +84,21 @@
check_commands.append((c, cmd))
- for i, (c, cmd) in enumerate(check_commands):
+ def my_process(i, c, cmd):
percent = 100.0 * (i / (len(check_commands) - 1))
percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
sys.stdout.write("%s %s\n" % (percent_str, c))
sys.stdout.flush()
- process = subprocess.Popen(cmd)
- process.wait()
+ return subprocess.Popen(cmd)
+ process_functions = []
+ for i, (c, cmd) in enumerate(check_commands):
+ process_functions.append((my_process, (i, c, cmd)))
+
+ project_source_info.queue_processes(process_functions)
+
+
if __name__ == "__main__":
main()
Modified: branches/bmesh/blender/build_files/cmake/project_source_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_source_info.py 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/build_files/cmake/project_source_info.py 2011-09-23 13:04:01 UTC (rev 40493)
@@ -148,6 +148,48 @@
return source
+# could be moved elsewhere!, this just happens to be used by scripts that also
+# use this module.
+def queue_processes(process_funcs, job_total=-1):
+ """ Takes a list of function arg pairs, each function must return a process
+ """
+ import sys
+
+ if job_total == -1:
+ import multiprocessing
+ job_total = multiprocessing.cpu_count()
+ del multiprocessing
+
+ if job_total == 1:
+ import os
+ import sys
+ for func, args in process_funcs:
+ sys.stdout.flush()
+ sys.stderr.flush()
+
+ process = func(*args)
+ process.wait()
+ else:
+ import time
+ import subprocess
+
+ processes = []
+ for func, args in process_funcs:
+ # wait until a thread is free
+ while 1:
+ processes[:] = [p for p in processes if p.poll() is None]
+
+ if len(processes) <= job_total:
+ break
+ else:
+ time.sleep(0.1)
+
+ sys.stdout.flush()
+ sys.stderr.flush()
+
+ processes.append(func(*args))
+
+
def main():
if not os.path.exists(join(CMAKE_DIR, "CMakeCache.txt")):
print("This script must run from the cmake build dir")
Modified: branches/bmesh/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/bmesh/blender/intern/elbeem/intern/loop_tools.h
===================================================================
--- branches/bmesh/blender/intern/elbeem/intern/loop_tools.h 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/intern/elbeem/intern/loop_tools.h 2011-09-23 13:04:01 UTC (rev 40493)
@@ -119,8 +119,8 @@
} \
\
const int Nj = mLevel[mMaxRefine].lSizey; \
- int jstart = 0+( id * (Nj / Nthrds) ); \
- int jend = 0+( (id+1) * (Nj / Nthrds) ); \
+ int jstart = 0+( (id * Nj ) / Nthrds ); \
+ int jend = 0+(((id+1) * Nj ) / Nthrds ); \
if( ((Nj/Nthrds) *Nthrds) != Nj) { \
errMsg("LbmFsgrSolver","Invalid domain size Nj="<<Nj<<" Nthrds="<<Nthrds); \
} \
Modified: branches/bmesh/blender/po/fr.po
===================================================================
--- branches/bmesh/blender/po/fr.po 2011-09-23 12:06:47 UTC (rev 40492)
+++ branches/bmesh/blender/po/fr.po 2011-09-23 13:04:01 UTC (rev 40493)
@@ -1,63 +1,58 @@
# French UI Translation
-# eon <eon.2008 at free.fr>, 2008
-# "Last-Translator: eon <eon.2008 at free.fr>\n"
-# "PO-Revision-Date: 2008-09-29 01:00+0100\n"
+# mont29 <montagne29 /at|chez\ wanadoo /dot|point\ fr>, 2011
+# zeauro <zeauron /at|chez\ gmail /dot|point\ com>, 2011
+# "Last-Translator: mont29 <montagne29 at/chez wanadoo dot/point fr>\n"
+# "PO-Revision-Date: 2011-09-16 00:00\n"
# "Content-Type: text/plain; charset=UTF-8\n"
# "Content-Transfer-Encoding: 8bit\n"
-# "Language-Team: eon (eon at jabber.fr) , serialsiner , kaal / project page : http://wiki.blender.org/index.php/Interface/fr"
-# "X-Generator: Gedit 2.22.0\n"
+# "Language-Team: mont29, zeauro / project page : http://wiki.blender.org/index.php/Interface/fr"
+# "X-Generator: Gedit 2.30.4\n"
# Copyright (C) 2005 Free Software Foundation, Inc.
#
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-09-15 07:51+0800\n"
-"Language: fr\n"
+"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: release/scripts/modules/rna_prop_ui.py:148
msgid "edit"
-msgstr ""
+msgstr "éditer"
#: release/scripts/modules/rna_prop_ui.py:160
-#, fuzzy
msgid "Custom Properties"
-msgstr "Transformations (Paramètres)"
+msgstr "Propriétés personnalisées"
#: release/scripts/startup/bl_operators/animsys_update.py:697
msgid ""
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list