[Bf-extensions-cvs] [53e4e3c] master: MeasureIt: Cleanup - Replace generic import
Antonioya
noreply at git.blender.org
Tue Aug 9 18:23:47 CEST 2016
Commit: 53e4e3c39dd04bfcf0ed42666b9883bdd52ff558
Author: Antonioya
Date: Tue Aug 9 16:25:28 2016 +0200
Branches: master
https://developer.blender.org/rBA53e4e3c39dd04bfcf0ed42666b9883bdd52ff558
MeasureIt: Cleanup - Replace generic import
===================================================================
M measureit/__init__.py
M measureit/measureit_geometry.py
M measureit/measureit_main.py
M measureit/measureit_render.py
===================================================================
diff --git a/measureit/__init__.py b/measureit/__init__.py
index 6513dfc..93e97c5 100644
--- a/measureit/__init__.py
+++ b/measureit/__init__.py
@@ -55,8 +55,8 @@ else:
# noinspection PyUnresolvedReferences
import bpy
-# noinspection PyUnresolvedReferences
-from bpy.props import *
+from bpy.types import Scene, WindowManager
+from bpy.props import FloatVectorProperty, IntProperty, BoolProperty, StringProperty, FloatProperty, EnumProperty
# --------------------------------------------------------------
@@ -83,7 +83,7 @@ def register():
bpy.utils.register_class(measureit_main.RenderSegmentButton)
# Define properties
- bpy.types.Scene.measureit_default_color = bpy.props.FloatVectorProperty(
+ Scene.measureit_default_color = FloatVectorProperty(
name="Default color",
description="Default Color",
default=(0.173, 0.545, 1.0, 1.0),
@@ -91,77 +91,77 @@ def register():
max=1,
subtype='COLOR',
size=4)
- bpy.types.Scene.measureit_font_size = bpy.props.IntProperty(name="Text Size",
+ Scene.measureit_font_size = IntProperty(name="Text Size",
description="Default text size",
default=14, min=10, max=150)
- bpy.types.Scene.measureit_hint_space = bpy.props.FloatProperty(name='Separation', min=0, max=100, default=0.1,
+ Scene.measureit_hint_space = FloatProperty(name='Separation', min=0, max=100, default=0.1,
precision=3,
description="Default distance to display measure")
- bpy.types.Scene.measureit_gl_ghost = bpy.props.BoolProperty(name="All",
+ Scene.measureit_gl_ghost = BoolProperty(name="All",
description="Display measures for all objects,"
" not only selected",
default=True)
- bpy.types.Scene.measureit_gl_txt = bpy.props.StringProperty(name="Text", maxlen=256,
+ Scene.measureit_gl_txt = StringProperty(name="Text", maxlen=256,
description="Short description (use | for line break)")
- bpy.types.Scene.measureit_gl_precision = bpy.props.IntProperty(name='Precision', min=0, max=5, default=2,
+ Scene.measureit_gl_precision = IntProperty(name='Precision', min=0, max=5, default=2,
description="Number of decimal precision")
- bpy.types.Scene.measureit_gl_show_d = bpy.props.BoolProperty(name="ShowDist",
+ Scene.measureit_gl_show_d = BoolProperty(name="ShowDist",
description="Display distances",
default=True)
- bpy.types.Scene.measureit_gl_show_n = bpy.props.BoolProperty(name="ShowName",
+ Scene.measureit_gl_show_n = BoolProperty(name="ShowName",
description="Display texts",
default=False)
- bpy.types.Scene.measureit_scale = bpy.props.BoolProperty(name="Scale",
+ Scene.measureit_scale = BoolProperty(name="Scale",
description="Use scale factor",
default=False)
- bpy.types.Scene.measureit_scale_factor = bpy.props.FloatProperty(name='Factor', min=0.001, max=9999999,
+ Scene.measureit_scale_factor = FloatProperty(name='Factor', min=0.001, max=9999999,
default=1.0,
precision=3,
description="Scale factor 1:x")
- bpy.types.Scene.measureit_scale_color = bpy.props.FloatVectorProperty(name="Scale color",
+ Scene.measureit_scale_color = FloatVectorProperty(name="Scale color",
description="Scale Color",
default=(1, 1, 0, 1.0),
min=0.1,
max=1,
subtype='COLOR',
size=4)
- bpy.types.Scene.measureit_scale_font = bpy.props.IntProperty(name="Font",
+ Scene.measureit_scale_font = IntProperty(name="Font",
description="Text size",
default=14, min=10, max=150)
- bpy.types.Scene.measureit_scale_pos_x = bpy.props.IntProperty(name="Position X",
+ Scene.measureit_scale_pos_x = IntProperty(name="Position X",
description="Margin on the X axis",
default=5,
min=0,
max=100)
- bpy.types.Scene.measureit_scale_pos_y = bpy.props.IntProperty(name="Position Y",
+ Scene.measureit_scale_pos_y = IntProperty(name="Position Y",
description="Margin on the Y axis",
default=5,
min=0,
max=100)
- bpy.types.Scene.measureit_gl_scaletxt = bpy.props.StringProperty(name="ScaleText", maxlen=48,
+ Scene.measureit_gl_scaletxt = StringProperty(name="ScaleText", maxlen=48,
description="Scale title",
default="Scale:")
- bpy.types.Scene.measureit_scale_precision = bpy.props.IntProperty(name='Precision', min=0, max=5, default=0,
+ Scene.measureit_scale_precision = IntProperty(name='Precision', min=0, max=5, default=0,
description="Number of decimal precision")
- bpy.types.Scene.measureit_ovr = bpy.props.BoolProperty(name="Override",
+ Scene.measureit_ovr = BoolProperty(name="Override",
description="Override colors and fonts",
default=False)
- bpy.types.Scene.measureit_ovr_font = bpy.props.IntProperty(name="Font",
+ Scene.measureit_ovr_font = IntProperty(name="Font",
description="Override text size",
default=14, min=10, max=150)
- bpy.types.Scene.measureit_ovr_color = bpy.props.FloatVectorProperty(name="Override color",
+ Scene.measureit_ovr_color = FloatVectorProperty(name="Override color",
description="Override Color",
default=(1, 0, 0, 1.0),
min=0.1,
max=1,
subtype='COLOR',
size=4)
- bpy.types.Scene.measureit_ovr_width = bpy.props.IntProperty(name='Override width', min=1, max=10, default=1,
+ Scene.measureit_ovr_width = IntProperty(name='Override width', min=1, max=10, default=1,
description='override line width')
- bpy.types.Scene.measureit_units = bpy.props.EnumProperty(items=(('1', "Automatic", "Use scene units"),
+ Scene.measureit_units = EnumProperty(items=(('1', "Automatic", "Use scene units"),
('2', "Meters", ""),
('3', "Centimeters", ""),
('4', "Milimiters", ""),
@@ -170,18 +170,18 @@ def register():
name="Units",
default="2",
description="Units")
- bpy.types.Scene.measureit_render = bpy.props.BoolProperty(name="Render",
+ Scene.measureit_render = BoolProperty(name="Render",
description="Save an image with measures over"
" render image",
default=False)
- bpy.types.Scene.measureit_render_type = bpy.props.EnumProperty(items=(('1', "*Current", "Use current render"),
+ Scene.measureit_render_type = EnumProperty(items=(('1', "*Current", "Use current render"),
('2', "OpenGL", ""),
('3', "Animation OpenGL", ""),
('4', "Image", ""),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list