projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7742926
)
Doc fix: rather then -> rather than
author
Sybren A. Stüvel <sybren@stuvel.eu>
Wed, 5 Aug 2015 10:47:37 +0000
(12:47 +0200)
committer
Sybren A. Stüvel <sybren@stuvel.eu>
Wed, 5 Aug 2015 10:48:04 +0000
(12:48 +0200)
doc/python_api/examples/bpy.types.Operator.1.py
patch
|
blob
|
history
doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
patch
|
blob
|
history
doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
patch
|
blob
|
history
doc/python_api/rst/info_gotcha.rst
patch
|
blob
|
history
doc/python_api/rst/info_quickstart.rst
patch
|
blob
|
history
doc/python_api/rst/info_tips_and_tricks.rst
patch
|
blob
|
history
source/blender/python/intern/bpy_rna.c
patch
|
blob
|
history
diff --git
a/doc/python_api/examples/bpy.types.Operator.1.py
b/doc/python_api/examples/bpy.types.Operator.1.py
index fc016508d39dd1cb64c3c313313c135bb57b190a..f007cdfa0a72982153aa2cd2b8e1f6ede12bbf3f 100644
(file)
--- a/
doc/python_api/examples/bpy.types.Operator.1.py
+++ b/
doc/python_api/examples/bpy.types.Operator.1.py
@@
-31,7
+31,7
@@
class SimpleMouseOperator(bpy.types.Operator):
y = bpy.props.IntProperty()
def execute(self, context):
y = bpy.props.IntProperty()
def execute(self, context):
- # rather th
e
n printing, use the report function,
+ # rather th
a
n printing, use the report function,
# this way the message appears in the header,
self.report({'INFO'}, "Mouse coords are %d %d" % (self.x, self.y))
return {'FINISHED'}
# this way the message appears in the header,
self.report({'INFO'}, "Mouse coords are %d %d" % (self.x, self.y))
return {'FINISHED'}
diff --git
a/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
b/doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
index faf3b121ec617a4cbf7985769fde78d88c884a88..6889fe75277f3d1059133508fb7295a91c6c4111 100644
(file)
--- a/
doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
+++ b/
doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py
@@
-1,7
+1,7
@@
"""
Note that when keying data paths which contain nested properties this must be
done from the :class:`ID` subclass, in this case the :class:`Armature` rather
"""
Note that when keying data paths which contain nested properties this must be
done from the :class:`ID` subclass, in this case the :class:`Armature` rather
-th
e
n the bone.
+th
a
n the bone.
"""
import bpy
"""
import bpy
diff --git
a/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
b/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
index 88b1d7da076ad29873f7b9cf4eb234b011903d07..74df50ddb586f28a75d21dd7037d33f96bf36c2b 100644
(file)
--- a/
doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
+++ b/
doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
@@
-137,7
+137,7
@@
base class --- :class:`SCA_IObject`
.. note::
.. note::
- A value of 0.0 disables this option (rather th
e
n setting it stationary).
+ A value of 0.0 disables this option (rather th
a
n setting it stationary).
.. attribute:: angularVelocityMin
.. attribute:: angularVelocityMin
diff --git
a/doc/python_api/rst/info_gotcha.rst
b/doc/python_api/rst/info_gotcha.rst
index 716bb5897bae865a2832bb1d0cdded22bc303cd9..430a862cf7b004850edbb9d9e383a9a9cadc039e 100644
(file)
--- a/
doc/python_api/rst/info_gotcha.rst
+++ b/
doc/python_api/rst/info_gotcha.rst
@@
-184,7
+184,7
@@
There are now 3 ways to access faces:
- :class:`bpy.types.MeshPolygon` -
this is the data structure which now stores faces in object mode
- :class:`bpy.types.MeshPolygon` -
this is the data structure which now stores faces in object mode
- (access as ``mesh.polygons`` rather th
e
n ``mesh.faces``).
+ (access as ``mesh.polygons`` rather th
a
n ``mesh.faces``).
- :class:`bpy.types.MeshTessFace` -
the result of triangulating (tessellated) polygons,
the main method of face access in 2.62 or older (access as ``mesh.tessfaces``).
- :class:`bpy.types.MeshTessFace` -
the result of triangulating (tessellated) polygons,
the main method of face access in 2.62 or older (access as ``mesh.tessfaces``).
@@
-444,7
+444,7
@@
this way you don't run this risk of referencing existing data from the blend fil
# normally some code, or function calls...
# normally some code, or function calls...
- # use own dictionary rather th
e
n bpy.data
+ # use own dictionary rather th
a
n bpy.data
mesh = mesh_name_mapping[meshid]
mesh = mesh_name_mapping[meshid]
@@
-494,7
+494,7
@@
A common case where you would run into this problem is when exporting a material
When using blender data from linked libraries there is an unfortunate complication
When using blender data from linked libraries there is an unfortunate complication
-since the path will be relative to the library rather th
e
n the open blend file.
+since the path will be relative to the library rather th
a
n the open blend file.
When the data block may be from an external blend file pass the library argument from the :class:`bpy.types.ID`.
>>> bpy.path.abspath(image.filepath, library=image.library)
When the data block may be from an external blend file pass the library argument from the :class:`bpy.types.ID`.
>>> bpy.path.abspath(image.filepath, library=image.library)
@@
-759,7
+759,7
@@
internally the array which stores this data is re-allocated.
point.co = 1.0, 2.0, 3.0
This can be avoided by re-assigning the point variables after adding the new one or by storing
point.co = 1.0, 2.0, 3.0
This can be avoided by re-assigning the point variables after adding the new one or by storing
-indices's to the points rather th
e
n the points themselves.
+indices's to the points rather th
a
n the points themselves.
The best way is to sidestep the problem altogether add all the points to the curve at once.
This means you don't have to worry about array re-allocation and its faster too
The best way is to sidestep the problem altogether add all the points to the curve at once.
This means you don't have to worry about array re-allocation and its faster too
@@
-782,7
+782,7
@@
The following example shows how this precortion works.
mesh = bpy.data.meshes.new(name="MyMesh")
# normally the script would use the mesh here...
bpy.data.meshes.remove(mesh)
mesh = bpy.data.meshes.new(name="MyMesh")
# normally the script would use the mesh here...
bpy.data.meshes.remove(mesh)
- print(mesh.name) # <- give an exception rather th
e
n crashing:
+ print(mesh.name) # <- give an exception rather th
a
n crashing:
# ReferenceError: StructRNA of type Mesh has been removed
# ReferenceError: StructRNA of type Mesh has been removed
diff --git
a/doc/python_api/rst/info_quickstart.rst
b/doc/python_api/rst/info_quickstart.rst
index 8ded6e6fae08198bed0850092e1135a658110261..ab106dd3bb777d86e28437a4c88ae7803cd1f6d3 100644
(file)
--- a/
doc/python_api/rst/info_quickstart.rst
+++ b/
doc/python_api/rst/info_quickstart.rst
@@
-59,7
+59,7
@@
text editor or entering commands in the Python console.
Both the *Text Editor* and *Python Console* are space types you can select from the view header.
Both the *Text Editor* and *Python Console* are space types you can select from the view header.
-Rather th
e
n manually configuring your spaces for Python development,
+Rather th
a
n manually configuring your spaces for Python development,
you may prefer to use the *Scripting* screen, included default with Blender,
accessible from the top headers screen selector.
you may prefer to use the *Scripting* screen, included default with Blender,
accessible from the top headers screen selector.
diff --git
a/doc/python_api/rst/info_tips_and_tricks.rst
b/doc/python_api/rst/info_tips_and_tricks.rst
index da213e32a780b88b0178ef28e65255503e280b0c..28d129b5b139e10457fc6843502d2a0280d87fd3 100644
(file)
--- a/
doc/python_api/rst/info_tips_and_tricks.rst
+++ b/
doc/python_api/rst/info_tips_and_tricks.rst
@@
-81,7
+81,7
@@
Editing a text file externally and having the same text open in Blender does wor
so here are 2 ways you can easily use an external file from Blender.
Using the following examples you'll still need textblock in Blender to execute,
so here are 2 ways you can easily use an external file from Blender.
Using the following examples you'll still need textblock in Blender to execute,
-but reference an external file rather th
e
n including it directly.
+but reference an external file rather th
a
n including it directly.
Executing External Scripts
Executing External Scripts
@@
-306,7
+306,7
@@
Python Safety (Build Option)
Since it's possible to access data which has been removed (see Gotcha's),
this can be hard to track down the cause of crashes.
Since it's possible to access data which has been removed (see Gotcha's),
this can be hard to track down the cause of crashes.
-To raise Python exceptions on accessing freed data (rather th
e
n crashing),
+To raise Python exceptions on accessing freed data (rather th
a
n crashing),
enable the CMake build option WITH_PYTHON_SAFETY.
This enables data tracking which makes data access about 2x slower
enable the CMake build option WITH_PYTHON_SAFETY.
This enables data tracking which makes data access about 2x slower
diff --git
a/source/blender/python/intern/bpy_rna.c
b/source/blender/python/intern/bpy_rna.c
index e74eaefc2b0dbdbcc6d864a7426d3167b572d5f4..bd07c7370a47e1beff9f72200bc7f36402da9f8a 100644
(file)
--- a/
source/blender/python/intern/bpy_rna.c
+++ b/
source/blender/python/intern/bpy_rna.c
@@
-3357,7
+3357,7
@@
static PyObject *pyrna_prop_path_from_id(BPy_PropertyRNA *self)
PyDoc_STRVAR(pyrna_prop_as_bytes_doc,
".. method:: as_bytes()\n"
"\n"
PyDoc_STRVAR(pyrna_prop_as_bytes_doc,
".. method:: as_bytes()\n"
"\n"
-" Returns this string property as a byte rather th
e
n a python string.\n"
+" Returns this string property as a byte rather th
a
n a python string.\n"
"\n"
" :return: The string as bytes.\n"
" :rtype: bytes\n"
"\n"
" :return: The string as bytes.\n"
" :rtype: bytes\n"