diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-18 04:48:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-18 04:48:59 +0400 |
| commit | c1ceab1281ccf061f03f8000bf190a082a5385d8 (patch) | |
| tree | 01b9a9cfca80432d316bdad6c18c74eb025e9eb0 /source/tests | |
| parent | 0d9c98c4bbfbc8c70c4772086dd09a51d01921ef (diff) | |
| parent | 66a35e089a64d27bfc09c2225a530069eca05875 (diff) | |
Merged changes in the trunk up to revision 55357.
Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c
Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.
Diffstat (limited to 'source/tests')
| -rw-r--r-- | source/tests/bl_pyapi_mathutils.py | 2 | ||||
| -rw-r--r-- | source/tests/bl_run_operators.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/tests/bl_pyapi_mathutils.py b/source/tests/bl_pyapi_mathutils.py index a37f74463ee..1754644e813 100644 --- a/source/tests/bl_pyapi_mathutils.py +++ b/source/tests/bl_pyapi_mathutils.py @@ -89,7 +89,7 @@ class MatrixTesting(unittest.TestCase): (19, 26, 33), (29, 40, 51))) - self.assertEqual(mat1*mat2, prod_mat1) + self.assertEqual(mat1 * mat2, prod_mat1) self.assertEqual(mat2 * mat1, prod_mat2) def test_mat4x4_vec3D_mult(self): diff --git a/source/tests/bl_run_operators.py b/source/tests/bl_run_operators.py index 0202f7c64fb..e6f1cc56eb0 100644 --- a/source/tests/bl_run_operators.py +++ b/source/tests/bl_run_operators.py @@ -139,7 +139,9 @@ if USE_ATTRSET: if subvalue == parent: continue - + # grr, recursive! + if prop == "point_caches": + continue subvalue_type = type(subvalue) yield value, prop, subvalue_type subvalue_id = getattr(subvalue, "id_data", Ellipsis) |