diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2014-10-23 17:12:28 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2014-10-23 17:12:28 +0400 |
| commit | 9ff1ebed52e0f858a395eeea4caf89304e068b2d (patch) | |
| tree | b05d0f4b229de61b088a128ad412dd7bba347928 /doc/python_api/examples | |
| parent | a2ed11c6eeab5fab8cb81e32e1c68fdafdd5dbbc (diff) | |
| parent | eaaeae469968c5c78a5d7e6d202f1af00b382a79 (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2014-fluid
Conflicts:
.gitignore
intern/cycles/CMakeLists.txt
source/blender/blenkernel/intern/smoke.c
source/blender/python/intern/bpy_interface.c
source/creator/CMakeLists.txt
Diffstat (limited to 'doc/python_api/examples')
4 files changed, 3 insertions, 4 deletions
diff --git a/doc/python_api/examples/bpy.props.5.py b/doc/python_api/examples/bpy.props.5.py index d2ace54de27..4e9d61d5385 100644 --- a/doc/python_api/examples/bpy.props.5.py +++ b/doc/python_api/examples/bpy.props.5.py @@ -75,7 +75,7 @@ print(scene.test_float) scene.test_array = (True, False) print([x for x in scene.test_array]) -#scene.test_date = "blah" # this would fail, property is read-only +# scene.test_date = "blah" # this would fail, property is read-only print(scene.test_date) scene.test_enum = 'BLUE' diff --git a/doc/python_api/examples/bpy.types.Operator.5.py b/doc/python_api/examples/bpy.types.Operator.5.py index 4a0abcb62c3..78030c7d7c4 100644 --- a/doc/python_api/examples/bpy.types.Operator.5.py +++ b/doc/python_api/examples/bpy.types.Operator.5.py @@ -39,7 +39,7 @@ class ModalOperator(bpy.types.Operator): self.execute(context) elif event.type == 'LEFTMOUSE': # Confirm return {'FINISHED'} - elif event.type in ('RIGHTMOUSE', 'ESC'): # Cancel + elif event.type in {'RIGHTMOUSE', 'ESC'}: # Cancel context.object.location.x = self.init_loc_x return {'CANCELLED'} diff --git a/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py b/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py index 05163b332a9..a83b23e84f9 100644 --- a/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py +++ b/doc/python_api/examples/bpy.types.bpy_prop_collection.foreach_get.py @@ -8,4 +8,3 @@ collection.foreach_get(attr, some_seq) # Python equivalent for i in range(len(seq)): some_seq[i] = getattr(collection[i], attr) - diff --git a/doc/python_api/examples/mathutils.Euler.py b/doc/python_api/examples/mathutils.Euler.py index 3f87cc0ab04..bfd2a3ed5a0 100644 --- a/doc/python_api/examples/mathutils.Euler.py +++ b/doc/python_api/examples/mathutils.Euler.py @@ -5,7 +5,7 @@ import math eul = mathutils.Euler((0.0, math.radians(45.0), 0.0), 'XYZ') # rotate the euler -eul.rotate_axis(math.radians(10.0), 'Z') +eul.rotate_axis('Z', math.radians(10.0)) # you can access its components by attribute or index print("Euler X", eul.x) |