diff --git a/doc/python_api/examples/bpy.props.4.py b/doc/python_api/examples/bpy.props.4.py index 73c314498ed..c451e54c9de 100644 --- a/doc/python_api/examples/bpy.props.4.py +++ b/doc/python_api/examples/bpy.props.4.py @@ -8,11 +8,13 @@ used to update other properties or synchronize with external data. All properties define update functions except for CollectionProperty. .. warning:: + Remember that these callbacks may be executed in threaded context. .. warning:: - If the property belongs to an Operator, the update callback's first - parameter will be an OperatorProperties instance, rather than an instance + + If the property belongs to an Operator, the update callback's first + parameter will be an OperatorProperties instance, rather than an instance of the operator itself. This means you can't access other internal functions of the operator, only its other properties. diff --git a/doc/python_api/examples/bpy.props.5.py b/doc/python_api/examples/bpy.props.5.py index 49853168661..61d06bb25c2 100644 --- a/doc/python_api/examples/bpy.props.5.py +++ b/doc/python_api/examples/bpy.props.5.py @@ -8,6 +8,7 @@ automatically. Instead, the `get` and `set` functions will be called when the pr is respectively read or written from the API. .. warning:: + Remember that these callbacks may be executed in threaded context. """ diff --git a/source/blender/blenkernel/intern/anim_data.cc b/source/blender/blenkernel/intern/anim_data.cc index d75baf5ad98..6cc4183cf82 100644 --- a/source/blender/blenkernel/intern/anim_data.cc +++ b/source/blender/blenkernel/intern/anim_data.cc @@ -1518,4 +1518,3 @@ void BKE_animdata_blend_read_lib(BlendLibReader *reader, ID *id, AnimData *adt) /* link NLA-data */ BKE_nla_blend_read_lib(reader, id, &adt->nla_tracks); } - diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc index a5256d62f4b..08992e2260b 100644 --- a/source/blender/blenkernel/intern/constraint.cc +++ b/source/blender/blenkernel/intern/constraint.cc @@ -6594,4 +6594,3 @@ void BKE_constraint_blend_read_lib(BlendLibReader *reader, ID *id, ListBase *con BKE_constraints_id_loop(conlist, lib_link_constraint_cb, IDWALK_NOP, &cld); } - diff --git a/source/blender/blenkernel/intern/nla.cc b/source/blender/blenkernel/intern/nla.cc index 66685167e4e..9e5df494ad6 100644 --- a/source/blender/blenkernel/intern/nla.cc +++ b/source/blender/blenkernel/intern/nla.cc @@ -2406,4 +2406,3 @@ void BKE_nla_blend_read_lib(BlendLibReader *reader, ID *id, ListBase *tracks) blend_lib_read_nla_strips(reader, id, &nlt->strips); } } - diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index c0073d0747d..48a923f0d7f 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -729,7 +729,7 @@ if(WITH_COMPOSITOR_CPU) endif() endif() -# NOTE: WITH_COMPOSITOR_CPU is needed for rendering. +# NOTE: WITH_COMPOSITOR_CPU is needed for rendering. if(WITH_COMPOSITOR_REALTIME_TESTS AND WITH_COMPOSITOR_CPU) if(NOT OPENIMAGEIO_IDIFF) message(WARNING "Disabling realtime compositor tests because OIIO idiff does not exist") @@ -744,7 +744,7 @@ if(WITH_COMPOSITOR_REALTIME_TESTS AND WITH_COMPOSITOR_CPU) multiple_node_setups ) - + if(WITH_LIBMV) list(APPEND compositor_tests distort matte) endif()