diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 17:41:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:18:11 +0300 |
| commit | d140e70c496122915eb5c05aba83153e2e0d7998 (patch) | |
| tree | 1e589247d69da64aa7b0e7802319237ec050b5d6 /doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst | |
| parent | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (diff) | |
| parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) | |
Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments
Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.
Conflicts:
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/hash_mm2a.c
source/blender/bmesh/tools/bmesh_region_match.c
tests/gtests/blenlib/BLI_ghash_performance_test.cc
tests/gtests/blenlib/BLI_ghash_test.cc
tests/gtests/blenlib/CMakeLists.txt
Diffstat (limited to 'doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst')
| -rw-r--r-- | doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst b/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst index 291ee8426cf..0a6c5fc9025 100644 --- a/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst +++ b/doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst @@ -7,7 +7,7 @@ base class --- :class:`SCA_IActuator` .. class:: SCA_2DFilterActuator(SCA_IActuator) - Create, enable and disable 2D filters + Create, enable and disable 2D filters. The following properties don't have an immediate effect. You must active the actuator to get the result. @@ -29,7 +29,7 @@ base class --- :class:`SCA_IActuator` .. attribute:: mode - Type of 2D filter, use one of :ref:`these constants <Two-D-FilterActuator-mode>` + Type of 2D filter, use one of :ref:`these constants <Two-D-FilterActuator-mode>`. :type: integer |