[Bf-extensions-cvs] [1b201523] master: space_view3d_stored_views: initial working update 2.8
meta-androcto
noreply at git.blender.org
Sat Jun 8 09:03:57 CEST 2019
Commit: 1b2015236d9a1c7b4e13f1155f3c6b9e84d60c51
Author: meta-androcto
Date: Sat Jun 8 17:00:44 2019 +1000
Branches: master
https://developer.blender.org/rBAC1b2015236d9a1c7b4e13f1155f3c6b9e84d60c51
space_view3d_stored_views: initial working update 2.8
===================================================================
M space_view3d_stored_views/__init__.py
M space_view3d_stored_views/core.py
M space_view3d_stored_views/io.py
M space_view3d_stored_views/operators.py
M space_view3d_stored_views/properties.py
M space_view3d_stored_views/ui.py
===================================================================
diff --git a/space_view3d_stored_views/__init__.py b/space_view3d_stored_views/__init__.py
index aae9add7..f17d19d7 100644
--- a/space_view3d_stored_views/__init__.py
+++ b/space_view3d_stored_views/__init__.py
@@ -21,7 +21,7 @@ bl_info = {
"description": "Save and restore User defined views, pov, layers and display configs",
"author": "nfloyd, Francesco Siddi",
"version": (0, 3, 7),
- "blender": (2, 78, 0),
+ "blender": (2, 80, 0),
"location": "View3D > Properties > Stored Views",
"warning": "",
"wiki_url": "https://wiki.blender.org/index.php/Extensions:2.5/"
@@ -50,21 +50,22 @@ NOTE: logging setup has to be provided by the user in a separate config file
and will not have output until the logging configuration is set up
"""
-if "bpy" in locals():
- import importlib
- importlib.reload(core)
- importlib.reload(ui)
- importlib.reload(properties)
- importlib.reload(operators)
- importlib.reload(io)
-else:
- from . import core
- from . import ui
- from . import properties
- from . import operators
- from . import io
-
+# if "bpy" in locals():
+# import importlib
+# importlib.reload(core)
+# importlib.reload(ui)
+# importlib.reload(properties)
+# importlib.reload(operators)
+# importlib.reload(io)
+# else:
import bpy
+from . import core
+from . import ui
+from . import properties
+from . import operators
+from . import io
+
+
from bpy.props import (
BoolProperty,
IntProperty,
@@ -99,15 +100,15 @@ class VIEW3D_stored_views_initialize(Operator):
class VIEW3D_stored_views_preferences(AddonPreferences):
bl_idname = __name__
- show_exporters: BoolProperty(
- name="Enable I/O Operators",
- default=False,
- description="Enable Import/Export Operations in the UI:\n"
- "Import Stored Views preset,\n"
- "Export Stored Views preset and \n"
- "Import stored views from scene",
- )
- view_3d_update_rate: IntProperty(
+ # show_exporters : BoolProperty(
+ # name="Enable I/O Operators",
+ # default=False,
+ # description="Enable Import/Export Operations in the UI:\n"
+ # "Import Stored Views preset,\n"
+ # "Export Stored Views preset and \n"
+ # "Import stored views from scene",
+ # )
+ view_3d_update_rate : IntProperty(
name="3D view update",
description="Update rate of the 3D view redraw\n"
"Increse the value if the UI feels sluggish",
@@ -120,16 +121,24 @@ class VIEW3D_stored_views_preferences(AddonPreferences):
row = layout.row(align=True)
row.prop(self, "view_3d_update_rate", toggle=True)
- row.prop(self, "show_exporters", toggle=True)
+ # row.prop(self, "show_exporters", toggle=True)
def register():
- bpy.utils.register_module(__name__)
+ ui.register()
+ properties.register()
+ operators.register()
+ bpy.utils.register_class(VIEW3D_stored_views_initialize)
+ bpy.utils.register_class(VIEW3D_stored_views_preferences)
def unregister():
+ ui.unregister()
+ properties.unregister()
+ operators.unregister()
+ bpy.utils.unregister_class(VIEW3D_stored_views_initialize)
+ bpy.utils.unregister_class(VIEW3D_stored_views_preferences)
ui.VIEW3D_stored_views_draw.handle_remove(bpy.context)
- bpy.utils.unregister_module(__name__)
if hasattr(bpy.types.Scene, "stored_views"):
del bpy.types.Scene.stored_views
diff --git a/space_view3d_stored_views/core.py b/space_view3d_stored_views/core.py
index d7fb72b8..b57bdd6c 100644
--- a/space_view3d_stored_views/core.py
+++ b/space_view3d_stored_views/core.py
@@ -8,13 +8,13 @@ import hashlib
import bpy
-# Utility function get preferences setting for exporters
+#Utility function get preferences setting for exporters
def get_preferences():
# replace the key if the add-on name changes
addon = bpy.context.preferences.addons[__package__]
- show_warn = (addon.preferences.show_exporters if addon else False)
+# show_warn = (addon.preferences.show_exporters if addon else False)
- return show_warn
+ return True
class StoredView():
@@ -75,7 +75,7 @@ class POV(StoredView):
else:
stored_view.lock_object_name = ""
stored_view.lock_cursor = view3d.lock_cursor
- stored_view.cursor_location = view3d.cursor_location
+ stored_view.cursor_location = bpy.context.scene.cursor.location
def update_v3d(self, stored_view):
view3d = self.view3d
@@ -131,95 +131,95 @@ class POV(StoredView):
return md5
-class Layers(StoredView):
- def __init__(self, index=None):
- super().__init__(mode='LAYERS', index=index)
- self.logger = logging.getLogger('%s.Layers' % __name__)
-
- def from_v3d(self, stored_view):
- view3d = self.view3d
- stored_view.view_layers = view3d.layers
- stored_view.scene_layers = self.scene.layers
- stored_view.lock_camera_and_layers = view3d.lock_camera_and_layers
-
- def update_v3d(self, stored_view):
- view3d = self.view3d
- view3d.lock_camera_and_layers = stored_view.lock_camera_and_layers
- if stored_view.lock_camera_and_layers is True:
- self.scene.layers = stored_view.scene_layers
- else:
- view3d.layers = stored_view.view_layers
-
- @staticmethod
- def is_modified(context, stored_view):
- Layers.logger = logging.getLogger('%s.Layers' % __name__)
- if stored_view.lock_camera_and_layers != context.space_data.lock_camera_and_layers:
- Layers.logger.debug('lock_camera_and_layers')
- return True
- if stored_view.lock_camera_and_layers is True:
- for i in range(20):
- if stored_view.scene_layers[i] != context.scene.layers[i]:
- Layers.logger.debug('scene_layers[%s]' % (i, ))
- return True
- else:
- for i in range(20):
- if stored_view.view_layers[i] != context.space_data.view3d.layers[i]:
- return True
- return False
-
-
-class Display(StoredView):
- def __init__(self, index=None):
- super().__init__(mode='DISPLAY', index=index)
- self.logger = logging.getLogger('%s.Display' % __name__)
-
- def from_v3d(self, stored_view):
- view3d = self.view3d
- stored_view.viewport_shade = view3d.viewport_shade
- stored_view.show_only_render = view3d.show_only_render
- stored_view.show_outline_selected = view3d.show_outline_selected
- stored_view.show_all_objects_origin = view3d.show_all_objects_origin
- stored_view.show_relationship_lines = view3d.show_relationship_lines
- stored_view.show_floor = view3d.show_floor
- stored_view.show_axis_x = view3d.show_axis_x
- stored_view.show_axis_y = view3d.show_axis_y
- stored_view.show_axis_z = view3d.show_axis_z
- stored_view.grid_lines = view3d.grid_lines
- stored_view.grid_scale = view3d.grid_scale
- stored_view.grid_subdivisions = view3d.grid_subdivisions
- stored_view.material_mode = self.scene.game_settings.material_mode
- stored_view.show_textured_solid = view3d.show_textured_solid
-
- def update_v3d(self, stored_view):
- view3d = self.view3d
- view3d.viewport_shade = stored_view.viewport_shade
- view3d.show_only_render = stored_view.show_only_render
- view3d.show_outline_selected = stored_view.show_outline_selected
- view3d.show_all_objects_origin = stored_view.show_all_objects_origin
- view3d.show_relationship_lines = stored_view.show_relationship_lines
- view3d.show_floor = stored_view.show_floor
- view3d.show_axis_x = stored_view.show_axis_x
- view3d.show_axis_y = stored_view.show_axis_y
- view3d.show_axis_z = stored_view.show_axis_z
- view3d.grid_lines = stored_view.grid_lines
- view3d.grid_scale = stored_view.grid_scale
- view3d.grid_subdivisions = stored_view.grid_subdivisions
- self.scene.game_settings.material_mode = stored_view.material_mode
- view3d.show_textured_solid = stored_view.show_textured_solid
-
- @staticmethod
- def is_modified(context, stored_view):
- Display.logger = logging.getLogger('%s.Display' % __name__)
- view3d = context.space_data
- excludes = ["material_mode", "quad_view", "lock_rotation", "show_sync_view", "use_box_clip", "name"]
- for k, v in stored_view.items():
- if k not in excludes:
- if getattr(view3d, k) != getattr(stored_view, k):
- return True
-
- if stored_view.material_mode != context.scene.game_settings.material_mode:
- Display.logger.debug('material_mode')
- return True
+# class Layers(StoredView):
+# def __init__(self, index=None):
+# super().__init__(mode='COLLECTIONS', index=index)
+# self.logger = logging.getLogger('%s.Layers' % __name__)
+
+# def from_v3d(self, stored_view):
+# view3d = self.view3d
+# stored_view.view_layers = bpy.types.layer.collection
+# stored_view.scene_layers = self.scene.layers
+# stored_view.lock_camera = view3d.lock_camera
+
+# def update_v3d(self, stored_view):
+# view3d = self.view3d
+# view3d.camera = stored_view.camera
+# if stored_view.camera is True:
+# self.scene.layers = stored_view.scene_layers
+# else:
+# view3d.layers = stored_view.view_layers
+
+ # @staticmethod
+ # def is_modified(context, stored_view):
+ # Layers.logger = logging.getLogger('%s.Layers' % __name__)
+ # if stored_view.camera != context.space_data.camera:
+ # Layers.logger.debug('lock_camera')
+ # return True
+ # if stored_view.camera is True:
+ # for i in range(20):
+ # if stored_view.scene_layers[i] != context.scene.layers[i]:
+ # Layers.logger.debug('scene_layers[%s]' % (i, ))
+ # return True
+ #
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list