diff options
Diffstat (limited to 'release/scripts/modules')
| -rw-r--r-- | release/scripts/modules/bpy/utils.py | 7 | ||||
| -rw-r--r-- | release/scripts/modules/bpy_types.py | 13 | ||||
| -rw-r--r-- | release/scripts/modules/rna_info.py | 6 |
3 files changed, 19 insertions, 7 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 28e4e71a627..cab5ee5e684 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -348,7 +348,7 @@ def smpte_from_seconds(time, fps=None): hours = minutes = seconds = frames = 0 if time < 0: - time = -time + time = - time neg = "-" else: neg = "" @@ -361,10 +361,10 @@ def smpte_from_seconds(time, fps=None): time = time % 60.0 seconds = int(time) - frames= int(round(math.floor( ((time - seconds) * fps)))) + frames= int(round(math.floor(((time - seconds) * fps)))) return "%s%02d:%02d:%02d:%02d" % (neg, hours, minutes, seconds, frames) - + def smpte_from_frame(frame, fps=None, fps_base=None): ''' @@ -380,4 +380,3 @@ def smpte_from_frame(frame, fps=None, fps_base=None): fps_base = _bpy.context.scene.render.fps_base return smpte_from_seconds((frame * fps_base) / fps, fps) -
\ No newline at end of file diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 6e4596a1109..edead35dafe 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -410,6 +410,19 @@ class MeshFace(StructRNA): return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[3]), ord_ind(verts[3], verts[0]) +class Text(bpy_types.ID): + __slots__ = () + + def as_string(self): + """Return the text as a string.""" + return "\n".join(line.line for line in self.lines) + + def from_string(self, string): + """Replace text with this string.""" + self.clear() + self.write(string) + + import collections diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index 80c61e0a6d9..fa1d15a7845 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -200,8 +200,8 @@ class InfoPropertyRNA: if self.type == "enum": self.enum_items[:] = rna_prop.items.keys() - - + + if self.array_length: self.default = tuple(getattr(rna_prop, "default_array", ())) else: @@ -245,7 +245,7 @@ class InfoPropertyRNA: type_str += self.type if self.array_length: type_str += " array of %d items" % (self.array_length) - + if self.type in ("float", "int"): type_str += " in [%s, %s]" % (range_str(self.min), range_str(self.max)) elif self.type == "enum": |