Merged changes in the trunk up to revision 42116.
[blender.git] / intern / cycles / blender / addon / properties.py
index 0c7deb01ed8c4ab25edee700fc734edc37796886..95f898f3ca5482b2c435279a1c4c0c4826e8633d 100644 (file)
 # <pep8 compliant>
 
 import bpy
-from bpy.props import *
+from bpy.props import (BoolProperty,
+                       EnumProperty,
+                       FloatProperty,
+                       IntProperty,
+                       PointerProperty)
 
 import math