[Bf-extensions-cvs] [425a3f6a] master: Cleanup: strip trailing space
Campbell Barton
noreply at git.blender.org
Mon Jan 25 02:34:51 CET 2021
Commit: 425a3f6a705beab849cab36d2ca2ae43726d700f
Author: Campbell Barton
Date: Mon Jan 25 12:33:47 2021 +1100
Branches: master
https://developer.blender.org/rBA425a3f6a705beab849cab36d2ca2ae43726d700f
Cleanup: strip trailing space
===================================================================
M blenderkit/__init__.py
M blenderkit/asset_pack_bg.py
M blenderkit/bl_ui_widgets/__init__.py
M blenderkit/bl_ui_widgets/bl_ui_button.py
M blenderkit/bl_ui_widgets/bl_ui_drag_panel.py
M blenderkit/bl_ui_widgets/bl_ui_draw_op.py
M blenderkit/bl_ui_widgets/bl_ui_label.py
M blenderkit/bl_ui_widgets/bl_ui_widget.py
M blenderkit/image_utils.py
M blenderkit/resolutions.py
M blenderkit/resolutions_bg.py
M bone_selection_sets.py
M greasepencil_tools/box_deform.py
M greasepencil_tools/import_brush_pack.py
M greasepencil_tools/line_reshape.py
M greasepencil_tools/prefs.py
M greasepencil_tools/rotate_canvas.py
M greasepencil_tools/timeline_scrub.py
M greasepencil_tools/ui_panels.py
M io_coat3D/__init__.py
M io_coat3D/folders.py
M io_coat3D/tex.py
M io_coat3D/updateimage.py
M io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py
M io_scene_gltf2/blender/imp/gltf2_io_draco_compression_extension.py
M io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
M io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py
M power_sequencer/operators/utils/functions.py
M rigify/rot_mode.py
===================================================================
diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index d3cd5a72..4a4ae4ba 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -91,13 +91,13 @@ else:
from blenderkit import upload
from blenderkit import utils
- from blenderkit.bl_ui_widgets import bl_ui_label
- from blenderkit.bl_ui_widgets import bl_ui_button
+ from blenderkit.bl_ui_widgets import bl_ui_label
+ from blenderkit.bl_ui_widgets import bl_ui_button
# from blenderkit.bl_ui_widgets import bl_ui_checkbox
# from blenderkit.bl_ui_widgets import bl_ui_slider
# from blenderkit.bl_ui_widgets import bl_ui_up_down
- from blenderkit.bl_ui_widgets import bl_ui_drag_panel
- from blenderkit.bl_ui_widgets import bl_ui_draw_op
+ from blenderkit.bl_ui_widgets import bl_ui_drag_panel
+ from blenderkit.bl_ui_widgets import bl_ui_draw_op
# from blenderkit.bl_ui_widgets import bl_ui_textbox
diff --git a/blenderkit/asset_pack_bg.py b/blenderkit/asset_pack_bg.py
index adde9515..c59ca08d 100644
--- a/blenderkit/asset_pack_bg.py
+++ b/blenderkit/asset_pack_bg.py
@@ -5,4 +5,4 @@ from blenderkit import resolutions
BLENDERKIT_EXPORT_DATA = sys.argv[-1]
if __name__ == "__main__":
- resolutions.run_bg(sys.argv[-1])
\ No newline at end of file
+ resolutions.run_bg(sys.argv[-1])
diff --git a/blenderkit/bl_ui_widgets/__init__.py b/blenderkit/bl_ui_widgets/__init__.py
index 745f59c9..a1db444d 100644
--- a/blenderkit/bl_ui_widgets/__init__.py
+++ b/blenderkit/bl_ui_widgets/__init__.py
@@ -16,7 +16,7 @@ from bpy.props import *
addon_keymaps = []
def register():
-
+
bpy.utils.register_class(DP_OT_draw_operator)
kcfg = bpy.context.window_manager.keyconfigs.addon
if kcfg:
@@ -29,8 +29,8 @@ def unregister():
for km, kmi in addon_keymaps:
km.keymap_items.remove(kmi)
addon_keymaps.clear()
-
+
bpy.utils.unregister_class(DP_OT_draw_operator)
-
+
if __name__ == "__main__":
register()
diff --git a/blenderkit/bl_ui_widgets/bl_ui_button.py b/blenderkit/bl_ui_widgets/bl_ui_button.py
index ce26c54e..f3902c4b 100644
--- a/blenderkit/bl_ui_widgets/bl_ui_button.py
+++ b/blenderkit/bl_ui_widgets/bl_ui_button.py
@@ -4,13 +4,13 @@ import blf
import bpy
class BL_UI_Button(BL_UI_Widget):
-
+
def __init__(self, x, y, width, height):
super().__init__(x, y, width, height)
self._text_color = (1.0, 1.0, 1.0, 1.0)
self._hover_bg_color = (0.5, 0.5, 0.5, 1.0)
self._select_bg_color = (0.7, 0.7, 0.7, 1.0)
-
+
self._text = "Button"
self._text_size = 16
self._textpos = (x, y)
@@ -35,7 +35,7 @@ class BL_UI_Button(BL_UI_Widget):
@text.setter
def text(self, value):
self._text = value
-
+
@property
def text_size(self):
return self._text_size
@@ -58,8 +58,8 @@ class BL_UI_Button(BL_UI_Widget):
@select_bg_color.setter
def select_bg_color(self, value):
- self._select_bg_color = value
-
+ self._select_bg_color = value
+
def set_image_size(self, imgage_size):
self.__image_size = imgage_size
@@ -68,30 +68,30 @@ class BL_UI_Button(BL_UI_Widget):
def set_image(self, rel_filepath):
try:
- self.__image = bpy.data.images.load(rel_filepath, check_existing=True)
+ self.__image = bpy.data.images.load(rel_filepath, check_existing=True)
self.__image.gl_load()
except:
pass
- def update(self, x, y):
+ def update(self, x, y):
super().update(x, y)
self._textpos = [x, y]
-
+
def draw(self):
if not self.visible:
return
-
+
area_height = self.get_area_height()
self.shader.bind()
-
+
self.set_colors()
-
+
bgl.glEnable(bgl.GL_BLEND)
- self.batch_panel.draw(self.shader)
+ self.batch_panel.draw(self.shader)
- self.draw_image()
+ self.draw_image()
bgl.glDisable(bgl.GL_BLEND)
@@ -128,21 +128,21 @@ class BL_UI_Button(BL_UI_Widget):
if self.__image is not None:
try:
y_screen_flip = self.get_area_height() - self.y_screen
-
+
off_x, off_y = self.__image_position
sx, sy = self.__image_size
-
+
# bottom left, top left, top right, bottom right
vertices = (
- (self.x_screen + off_x, y_screen_flip - off_y),
- (self.x_screen + off_x, y_screen_flip - sy - off_y),
+ (self.x_screen + off_x, y_screen_flip - off_y),
+ (self.x_screen + off_x, y_screen_flip - sy - off_y),
(self.x_screen + off_x + sx, y_screen_flip - sy - off_y),
(self.x_screen + off_x + sx, y_screen_flip - off_y))
-
+
self.shader_img = gpu.shader.from_builtin('2D_IMAGE')
- self.batch_img = batch_for_shader(self.shader_img, 'TRI_FAN',
- { "pos" : vertices,
- "texCoord": ((0, 1), (0, 0), (1, 0), (1, 1))
+ self.batch_img = batch_for_shader(self.shader_img, 'TRI_FAN',
+ { "pos" : vertices,
+ "texCoord": ((0, 1), (0, 0), (1, 0), (1, 1))
},)
# send image to gpu if it isn't there already
@@ -154,39 +154,39 @@ class BL_UI_Button(BL_UI_Widget):
self.shader_img.bind()
self.shader_img.uniform_int("image", 0)
- self.batch_img.draw(self.shader_img)
+ self.batch_img.draw(self.shader_img)
return True
except:
pass
- return False
-
+ return False
+
def set_mouse_down(self, mouse_down_func):
- self.mouse_down_func = mouse_down_func
-
- def mouse_down(self, x, y):
+ self.mouse_down_func = mouse_down_func
+
+ def mouse_down(self, x, y):
if self.is_in_rect(x,y):
self.__state = 1
try:
self.mouse_down_func(self)
except Exception as e:
print(e)
-
+
return True
-
+
return False
-
+
def mouse_move(self, x, y):
if self.is_in_rect(x,y):
if(self.__state != 1):
-
+
# hover state
self.__state = 2
else:
self.__state = 0
-
+
def mouse_up(self, x, y):
if self.is_in_rect(x,y):
self.__state = 2
else:
- self.__state = 0
\ No newline at end of file
+ self.__state = 0
diff --git a/blenderkit/bl_ui_widgets/bl_ui_drag_panel.py b/blenderkit/bl_ui_widgets/bl_ui_drag_panel.py
index e07aa784..44a5b1b9 100644
--- a/blenderkit/bl_ui_widgets/bl_ui_drag_panel.py
+++ b/blenderkit/bl_ui_widgets/bl_ui_drag_panel.py
@@ -1,7 +1,7 @@
-from . bl_ui_widget import *
+from . bl_ui_widget import *
class BL_UI_Drag_Panel(BL_UI_Widget):
-
+
def __init__(self, x, y, width, height):
super().__init__(x,y, width, height)
self.drag_offset_x = 0
@@ -15,35 +15,35 @@ class BL_UI_Drag_Panel(BL_UI_Widget):
def add_widget(self, widget):
self.widgets.append(widget)
-
+
def add_widgets(self, widgets):
self.widgets = widgets
self.layout_widgets()
-
+
def layout_widgets(self):
for widget in self.widgets:
- widget.update(self.x_screen + widget.x, self.y_screen + widget.y)
-
+ widget.update(self.x_screen + widget.x, self.y_screen + widget.y)
+
def update(self, x, y):
super().update(x - self.drag_offset_x, y + self.drag_offset_y)
-
+
def child_widget_focused(self, x, y):
for widget in self.widgets:
if widget.is_in_rect(x, y):
- return True
+ return True
return False
-
+
def mouse_down(self, x, y):
if self.child_widget_focused(x, y):
return False
-
+
if self.is_in_rect(x,y):
height = self.get_area_height()
self.is_drag = True
self.drag_offset_x = x - self.x_screen
self.drag_offset_y = y - (height - self.y_screen)
return True
-
+
return False
def mouse_move(self, x, y):
@@ -55,4 +55,4 @@ class BL_UI_Drag_Panel(BL_UI_Widget):
def mouse_up(self, x, y):
self.is_drag = False
self.drag_offset_x = 0
- self.drag_offset_y = 0
\ No newline at end of file
+ self.drag_offset_y = 0
diff --git a/blenderkit/bl_ui_widgets/bl_ui_draw_op.py b/blenderkit/bl_ui_widgets/bl_ui_draw_op.py
index 2f534479..ab407f47 100644
--- a/blenderkit/bl_ui_widgets/bl_ui_draw_op.py
+++ b/blenderkit/bl_ui_widgets/bl_ui_draw_op.py
@@ -5,14 +5,14 @@ from bpy.types import Operator
class BL_UI_OT_draw_operator(Operator):
bl_idname = "object.bl_ui_ot_draw_operator"
bl_label = "bl ui widgets operator"
- bl_description = "Operator for bl ui widgets"
+ bl_description = "Operator for bl ui widgets"
bl_options = {'REGISTER'}
-
+
def __init__(self):
self.draw_handle = None
self.draw_event = None
self._finished = False
-
+
self.widgets = []
def init_widgets(self, context, widgets):
@@ -31,32 +31,32 @@ class BL_UI_OT_draw_operator(Operator):
self.on_invoke(context, event)
args = (self, context)
-
+
self.register_handlers(args, context)
-
+
context.window_manager.modal_handler_add(self)
return {"RUNNING_MODAL"}
-
+
def register_handlers(self, args, context):
self.draw_handle = bpy.types.SpaceView3D.draw_handler_add(self.draw_callback_px, args, "WINDOW", "POST_PIXEL")
self.draw_event = context.window_manager.event_timer_add(0.1, window=contex
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list