[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59600] branches/hive: updated some files that did not appear to be correctly synced
Sjoerd de Vries
sjdv1982 at gmail.com
Wed Aug 28 14:45:20 CEST 2013
Revision: 59600
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59600
Author: sjoerddevries
Date: 2013-08-28 12:45:19 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
updated some files that did not appear to be correctly synced
Modified Paths:
--------------
branches/hive/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/hive/build_files/cmake/cmake_static_check_cppcheck.py
branches/hive/build_files/cmake/cmake_static_check_sparse.py
branches/hive/build_files/cmake/cmake_static_check_splint.py
branches/hive/build_files/cmake/project_source_info.py
branches/hive/release/scripts/modules/bpy_extras/anim_utils.py
branches/hive/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/hive/release/scripts/startup/bl_ui/properties_paint_common.py
branches/hive/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/hive/release/scripts/startup/bl_ui/space_clip.py
branches/hive/source/blender/blenfont/BLF_translation.h
branches/hive/source/blender/blenfont/intern/blf_translation.c
branches/hive/source/blender/blenkernel/BKE_camera.h
branches/hive/source/blender/blenkernel/BKE_dynamicpaint.h
branches/hive/source/blender/blenkernel/BKE_lamp.h
branches/hive/source/blender/blenkernel/BKE_movieclip.h
branches/hive/source/blender/blenkernel/BKE_ocean.h
branches/hive/source/blender/blenkernel/BKE_tracking.h
branches/hive/source/blender/blenkernel/intern/camera.c
branches/hive/source/blender/blenkernel/intern/dynamicpaint.c
branches/hive/source/blender/blenkernel/intern/editderivedmesh.c
branches/hive/source/blender/blenkernel/intern/lamp.c
branches/hive/source/blender/blenkernel/intern/movieclip.c
branches/hive/source/blender/blenkernel/intern/navmesh_conversion.c
branches/hive/source/blender/blenkernel/intern/ocean.c
branches/hive/source/blender/blenkernel/intern/tracking.c
branches/hive/source/blender/blenlib/BLI_array.h
branches/hive/source/blender/blenlib/BLI_fileops_types.h
branches/hive/source/blender/blenlib/BLI_md5.h
branches/hive/source/blender/blenlib/BLI_string_utf8.h
branches/hive/source/blender/blenlib/intern/math_color_inline.c
branches/hive/source/blender/blenlib/intern/md5.c
branches/hive/source/blender/blenlib/intern/string_utf8.c
branches/hive/source/blender/imbuf/IMB_moviecache.h
branches/hive/source/blender/imbuf/intern/moviecache.c
branches/hive/source/blender/makesdna/DNA_defs.h
branches/hive/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/hive/source/blender/makesdna/DNA_movieclip_types.h
branches/hive/source/blender/makesdna/DNA_tracking_types.h
branches/hive/source/blender/makesrna/intern/rna_camera_api.c
branches/hive/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/hive/source/blender/makesrna/intern/rna_movieclip.c
branches/hive/source/blender/makesrna/intern/rna_tracking.c
branches/hive/source/blender/python/generic/idprop_py_api.c
branches/hive/source/blender/python/generic/idprop_py_api.h
branches/hive/source/blender/python/intern/bpy_app_ffmpeg.c
branches/hive/source/blender/python/intern/bpy_app_ffmpeg.h
branches/hive/source/blender/python/intern/bpy_interface_atexit.c
branches/hive/source/blender/python/intern/gpu.c
branches/hive/source/blender/python/intern/gpu.h
branches/hive/source/blender/python/mathutils/mathutils_noise.c
branches/hive/source/blender/python/mathutils/mathutils_noise.h
branches/hive/source/blender/render/extern/include/RE_engine.h
branches/hive/source/blender/render/intern/include/render_result.h
branches/hive/source/blender/render/intern/include/texture_ocean.h
branches/hive/source/blender/render/intern/source/external_engine.c
branches/hive/source/blender/render/intern/source/render_result.c
branches/hive/source/blender/render/intern/source/texture_ocean.c
branches/hive/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/hive/source/gameengine/Ketsji/KX_NavMeshObject.h
branches/hive/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/hive/source/gameengine/Ketsji/KX_ObstacleSimulation.h
branches/hive/source/gameengine/Ketsji/KX_PythonMain.cpp
branches/hive/source/gameengine/Ketsji/KX_PythonMain.h
branches/hive/source/gameengine/Ketsji/KX_SteeringActuator.cpp
branches/hive/source/gameengine/Ketsji/KX_SteeringActuator.h
branches/hive/source/tests/bl_mesh_modifiers.py
branches/hive/source/tests/bl_pyapi_mathutils.py
branches/hive/source/tools/spell_check_source.py
branches/hive/source/tools/spell_check_source_config.py
Modified: branches/hive/build_files/cmake/Modules/FindOpenImageIO.cmake
===================================================================
--- branches/hive/build_files/cmake/Modules/FindOpenImageIO.cmake 2013-08-28 11:35:25 UTC (rev 59599)
+++ branches/hive/build_files/cmake/Modules/FindOpenImageIO.cmake 2013-08-28 12:45:19 UTC (rev 59600)
@@ -33,6 +33,7 @@
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
+ /opt/lib/oiio
)
FIND_PATH(OPENIMAGEIO_INCLUDE_DIR
Modified: branches/hive/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/hive/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-28 11:35:25 UTC (rev 59599)
+++ branches/hive/build_files/cmake/cmake_static_check_cppcheck.py 2013-08-28 12:45:19 UTC (rev 59600)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
@@ -27,9 +27,12 @@
import sys
import os
+USE_QUIET = (os.environ.get("QUIET", None) is not None)
+
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
+ "blender/intern/opennl",
]
CHECKER_BIN = "cppcheck"
@@ -38,34 +41,40 @@
# not sure why this is needed, but it is.
"-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
"--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
- # "--max-configs=1", # speeds up execution
+ "--max-configs=1", # speeds up execution
# "--check-config", # when includes are missing
- # "--enable=all", # if you want sixty hundred pedantic suggestions
+ "--enable=all", # if you want sixty hundred pedantic suggestions
]
+if USE_QUIET:
+ CHECKER_ARGS.append("--quiet")
+
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
cmd = ([CHECKER_BIN] +
- CHECKER_ARGS +
+ CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
- )
+ [("-D%s" % d) for d in defs] +
+ source_defines
+ )
check_commands.append((c, cmd))
process_functions = []
def my_process(i, c, cmd):
- percent = 100.0 * (i / (len(check_commands) - 1))
- percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+ if not USE_QUIET:
+ percent = 100.0 * (i / (len(check_commands) - 1))
+ percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
- sys.stdout.flush()
- sys.stdout.write("%s " % percent_str)
+ sys.stdout.flush()
+ sys.stdout.write("%s " % percent_str)
return subprocess.Popen(cmd)
@@ -74,6 +83,8 @@
project_source_info.queue_processes(process_functions)
+ print("Finished!")
+
if __name__ == "__main__":
main()
Modified: branches/hive/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/hive/build_files/cmake/cmake_static_check_sparse.py 2013-08-28 11:35:25 UTC (rev 59599)
+++ branches/hive/build_files/cmake/cmake_static_check_sparse.py 2013-08-28 12:45:19 UTC (rev 59600)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
@@ -25,6 +25,7 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
+ "blender/intern/opennl",
]
CHECKER_BIN = "sparse"
@@ -34,29 +35,35 @@
import project_source_info
import subprocess
import sys
+import os
+USE_QUIET = (os.environ.get("QUIET", None) is not None)
+
def main():
source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
cmd = ([CHECKER_BIN] +
- CHECKER_ARGS +
+ CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
- )
+ [("-D%s" % d) for d in defs] +
+ source_defines
+ )
check_commands.append((c, cmd))
def my_process(i, c, cmd):
- percent = 100.0 * (i / (len(check_commands) - 1))
- percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+ if not USE_QUIET:
+ 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()
+ sys.stdout.write("%s %s\n" % (percent_str, c))
return subprocess.Popen(cmd)
Modified: branches/hive/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- branches/hive/build_files/cmake/cmake_static_check_splint.py 2013-08-28 11:35:25 UTC (rev 59599)
+++ branches/hive/build_files/cmake/cmake_static_check_splint.py 2013-08-28 12:45:19 UTC (rev 59600)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
@@ -25,6 +25,7 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
+ "blender/intern/opennl",
]
CHECKER_BIN = "splint"
@@ -67,28 +68,32 @@
import project_source_info
import subprocess
import sys
+import os
+USE_QUIET = (os.environ.get("QUIET", None) is not None)
+
def main():
source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
check_commands = []
for c, inc_dirs, defs in source_info:
cmd = ([CHECKER_BIN] +
- CHECKER_ARGS +
+ CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
[("-D%s" % d) for d in defs]
- )
+ )
check_commands.append((c, cmd))
def my_process(i, c, cmd):
- percent = 100.0 * (i / (len(check_commands) - 1))
- percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+ if not USE_QUIET:
+ 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()
+ sys.stdout.write("%s %s\n" % (percent_str, c))
+ sys.stdout.flush()
return subprocess.Popen(cmd)
Modified: branches/hive/build_files/cmake/project_source_info.py
===================================================================
--- branches/hive/build_files/cmake/project_source_info.py 2013-08-28 11:35:25 UTC (rev 59599)
+++ branches/hive/build_files/cmake/project_source_info.py 2013-08-28 12:45:19 UTC (rev 59600)
@@ -43,12 +43,12 @@
def is_c_header(filename):
ext = os.path.splitext(filename)[1]
- return (ext in (".h", ".hpp", ".hxx"))
+ return (ext in {".h", ".hpp", ".hxx", ".hh"})
def is_c(filename):
ext = os.path.splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
+ return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".osl"})
def is_c_any(filename):
@@ -82,11 +82,21 @@
import subprocess
import time
- print("running make with --dry-run ...")
- process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
- stdout=subprocess.PIPE,
- )
+ # support both make and ninja
+ make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
+ make_exe_basename = os.path.basename(make_exe)
+ if make_exe_basename.startswith(("make", "gmake")):
+ print("running 'make' with --dry-run ...")
+ process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
+ stdout=subprocess.PIPE,
+ )
+ elif make_exe_basename.startswith("ninja"):
+ print("running 'ninja' with -t commands ...")
+ process = subprocess.Popen([make_exe, "-t", "commands"],
+ stdout=subprocess.PIPE,
+ )
+
while process.poll():
time.sleep(1)
@@ -145,6 +155,12 @@
source.append((c, inc_dirs, defs))
+ # make relative includes absolute
+ # not totally essential but useful
+ for i, f in enumerate(inc_dirs):
+ if not os.path.isabs(f):
+ inc_dirs[i] = os.path.abspath(os.path.join(CMAKE_DIR, f))
+
# safety check that our includes are ok
for f in inc_dirs:
if not os.path.exists(f):
@@ -155,6 +171,26 @@
return source
+def build_defines_as_source():
+ """
+ Returns a string formatted as an include:
+ '#defines A=B\n#define....'
+ """
+ import subprocess
+ # works for both gcc and clang
+ cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
+ return subprocess.Popen(cmd,
+ stdout=subprocess.PIPE,
+ stdin=subprocess.DEVNULL,
+ ).stdout.read().strip().decode('ascii')
+
+
+def build_defines_as_args():
+ return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
+ for l in build_defines_as_source().split("\n")
+ if l.startswith('#define')]
+
+
# 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):
Modified: branches/hive/release/scripts/modules/bpy_extras/anim_utils.py
===================================================================
--- branches/hive/release/scripts/modules/bpy_extras/anim_utils.py 2013-08-28 11:35:25 UTC (rev 59599)
+++ branches/hive/release/scripts/modules/bpy_extras/anim_utils.py 2013-08-28 12:45:19 UTC (rev 59600)
@@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8-80 compliant>
+# <pep8 compliant>
__all__ = (
"bake_action",
@@ -31,7 +31,9 @@
only_selected=False,
do_pose=True,
do_object=True,
+ do_visual_keying=True,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list