[Bf-extensions-cvs] [5a1e3d50] master: Collection Manager: Refactor and cleanup. Task: T69577
Ryan Inch
noreply at git.blender.org
Wed Nov 4 06:18:55 CET 2020
Commit: 5a1e3d5023c0605885d7de52856ad97114dbd35f
Author: Ryan Inch
Date: Wed Nov 4 00:14:51 2020 -0500
Branches: master
https://developer.blender.org/rBA5a1e3d5023c0605885d7de52856ad97114dbd35f
Collection Manager: Refactor and cleanup. Task: T69577
Change how addon wide variables are imported.
===================================================================
M object_collection_manager/internals.py
M object_collection_manager/operator_utils.py
M object_collection_manager/operators.py
M object_collection_manager/qcd_move_widget.py
M object_collection_manager/qcd_operators.py
M object_collection_manager/ui.py
===================================================================
diff --git a/object_collection_manager/internals.py b/object_collection_manager/internals.py
index ceef1560..c95328c8 100644
--- a/object_collection_manager/internals.py
+++ b/object_collection_manager/internals.py
@@ -106,10 +106,6 @@ swap_buffer = {
}
-def get_max_lvl():
- return max_lvl
-
-
class QCDSlots():
_slots = {}
overrides = set()
diff --git a/object_collection_manager/operator_utils.py b/object_collection_manager/operator_utils.py
index 2544b76b..393086f7 100644
--- a/object_collection_manager/operator_utils.py
+++ b/object_collection_manager/operator_utils.py
@@ -19,14 +19,11 @@
# Copyright 2011, Ryan Inch
import bpy
+# For VARS
+from . import internals
+
+# For FUNCTIONS
from .internals import (
- layer_collections,
- qcd_slots,
- expanded,
- expand_history,
- rto_history,
- copy_buffer,
- swap_buffer,
update_property_group,
get_move_selection,
)
@@ -157,22 +154,22 @@ def isolate_rto(cls, self, view_layer, rto, *, children=False):
off = set_off_on[rto]["off"]
on = set_off_on[rto]["on"]
- laycol_ptr = layer_collections[self.name]["ptr"]
- target = rto_history[rto][view_layer]["target"]
- history = rto_history[rto][view_layer]["history"]
+ laycol_ptr = internals.layer_collections[self.name]["ptr"]
+ target = internals.rto_history[rto][view_layer]["target"]
+ history = internals.rto_history[rto][view_layer]["history"]
# get active collections
- active_layer_collections = [x["ptr"] for x in layer_collections.values()
+ active_layer_collections = [x["ptr"] for x in internals.layer_collections.values()
if get_rto(x["ptr"], rto) == on]
# check if previous state should be restored
if cls.isolated and self.name == target:
# restore previous state
- for x, item in enumerate(layer_collections.values()):
+ for x, item in enumerate(internals.layer_collections.values()):
set_rto(item["ptr"], rto, history[x])
# reset target and history
- del rto_history[rto][view_layer]
+ del internals.rto_history[rto][view_layer]
cls.isolated = False
@@ -180,24 +177,24 @@ def isolate_rto(cls, self, view_layer, rto, *, children=False):
elif (len(active_layer_collections) == 1 and
active_layer_collections[0].name == self.name):
# activate all collections
- for item in layer_collections.values():
+ for item in internals.layer_collections.values():
set_rto(item["ptr"], rto, on)
# reset target and history
- del rto_history[rto][view_layer]
+ del internals.rto_history[rto][view_layer]
cls.isolated = False
else:
# isolate collection
- rto_history[rto][view_layer]["target"] = self.name
+ internals.rto_history[rto][view_layer]["target"] = self.name
# reset history
history.clear()
# save state
- for item in layer_collections.values():
+ for item in internals.layer_collections.values():
history.append(get_rto(item["ptr"], rto))
child_states = {}
@@ -209,7 +206,7 @@ def isolate_rto(cls, self, view_layer, rto, *, children=False):
apply_to_children(laycol_ptr, get_child_states)
# isolate collection
- for item in layer_collections.values():
+ for item in internals.layer_collections.values():
if item["name"] != laycol_ptr.name:
set_rto(item["ptr"], rto, off)
@@ -217,7 +214,7 @@ def isolate_rto(cls, self, view_layer, rto, *, children=False):
if rto not in ["exclude", "holdout", "indirect"]:
# activate all parents
- laycol = layer_collections[self.name]
+ laycol = internals.layer_collections[self.name]
while laycol["id"] != 0:
set_rto(laycol["ptr"], rto, on)
laycol = laycol["parent"]
@@ -248,10 +245,10 @@ def isolate_rto(cls, self, view_layer, rto, *, children=False):
def toggle_children(self, view_layer, rto):
- laycol_ptr = layer_collections[self.name]["ptr"]
+ laycol_ptr = internals.layer_collections[self.name]["ptr"]
# clear rto history
- del rto_history[rto][view_layer]
- rto_history[rto+"_all"].pop(view_layer, None)
+ del internals.rto_history[rto][view_layer]
+ internals.rto_history[rto+"_all"].pop(view_layer, None)
# toggle rto state
state = not get_rto(laycol_ptr, rto)
@@ -267,13 +264,13 @@ def activate_all_rtos(view_layer, rto):
off = set_off_on[rto]["off"]
on = set_off_on[rto]["on"]
- history = rto_history[rto+"_all"][view_layer]
+ history = internals.rto_history[rto+"_all"][view_layer]
# if not activated, activate all
if len(history) == 0:
keep_history = False
- for item in reversed(list(layer_collections.values())):
+ for item in reversed(list(internals.layer_collections.values())):
if get_rto(item["ptr"], rto) == off:
keep_history = True
@@ -287,37 +284,37 @@ def activate_all_rtos(view_layer, rto):
history.reverse()
else:
- for x, item in enumerate(layer_collections.values()):
+ for x, item in enumerate(internals.layer_collections.values()):
set_rto(item["ptr"], rto, history[x])
# clear rto history
- del rto_history[rto+"_all"][view_layer]
+ del internals.rto_history[rto+"_all"][view_layer]
def invert_rtos(view_layer, rto):
if rto == "exclude":
orig_values = []
- for item in layer_collections.values():
+ for item in internals.layer_collections.values():
orig_values.append(get_rto(item["ptr"], rto))
- for x, item in enumerate(layer_collections.values()):
+ for x, item in enumerate(internals.layer_collections.values()):
set_rto(item["ptr"], rto, not orig_values[x])
else:
- for item in layer_collections.values():
+ for item in internals.layer_collections.values():
set_rto(item["ptr"], rto, not get_rto(item["ptr"], rto))
# clear rto history
- rto_history[rto].pop(view_layer, None)
+ internals.rto_history[rto].pop(view_layer, None)
def copy_rtos(view_layer, rto):
- if not copy_buffer["RTO"]:
+ if not internals.copy_buffer["RTO"]:
# copy
- copy_buffer["RTO"] = rto
- for laycol in layer_collections.values():
- copy_buffer["values"].append(get_off_on[
+ internals.copy_buffer["RTO"] = rto
+ for laycol in internals.layer_collections.values():
+ internals.copy_buffer["values"].append(get_off_on[
get_rto(laycol["ptr"], rto)
][
rto
@@ -326,29 +323,29 @@ def copy_rtos(view_layer, rto):
else:
# paste
- for x, laycol in enumerate(layer_collections.values()):
+ for x, laycol in enumerate(internals.layer_collections.values()):
set_rto(laycol["ptr"],
rto,
set_off_on[rto][
- copy_buffer["values"][x]
+ internals.copy_buffer["values"][x]
]
)
# clear rto history
- rto_history[rto].pop(view_layer, None)
- del rto_history[rto+"_all"][view_layer]
+ internals.rto_history[rto].pop(view_layer, None)
+ del internals.rto_history[rto+"_all"][view_layer]
# clear copy buffer
- copy_buffer["RTO"] = ""
- copy_buffer["values"].clear()
+ internals.copy_buffer["RTO"] = ""
+ internals.copy_buffer["values"].clear()
def swap_rtos(view_layer, rto):
- if not swap_buffer["A"]["values"]:
+ if not internals.swap_buffer["A"]["values"]:
# get A
- swap_buffer["A"]["RTO"] = rto
- for laycol in layer_collections.values():
- swap_buffer["A"]["values"].append(get_off_on[
+ internals.swap_buffer["A"]["RTO"] = rto
+ for laycol in internals.layer_collections.values():
+ internals.swap_buffer["A"]["values"].append(get_off_on[
get_rto(laycol["ptr"], rto)
][
rto
@@ -357,9 +354,9 @@ def swap_rtos(view_layer, rto):
else:
# get B
- swap_buffer["B"]["RTO"] = rto
- for laycol in layer_collections.values():
- swap_buffer["B"]["values"].append(get_off_on[
+ internals.swap_buffer["B"]["RTO"] = rto
+ for laycol in internals.layer_collections.values():
+ internals.swap_buffer["B"]["values"].append(get_off_on[
get_rto(laycol["ptr"], rto)
][
rto
@@ -367,52 +364,52 @@ def swap_rtos(view_layer, rto):
)
# swap A with B
- for x, laycol in enumerate(layer_collections.values()):
- set_rto(laycol["ptr"], swap_buffer["A"]["RTO"],
+ for x, laycol in enumerate(internals.layer_collections.values()):
+ set_rto(laycol["ptr"], internals.swap_buffer["A"]["RTO"],
set_off_on[
- swap_buffer["A"]["RTO"]
+ internals.swap_buffer["A"]["RTO"]
][
- swap_buffer["B"]["values"][x]
+ internals.swap_buffer["B"]["values"][x]
]
)
- set_rto(laycol["ptr"], swap_buffer["B"]["RTO"],
+ set_rto(laycol["ptr"], internals.swap_buffer["B"]["RTO"],
set_off_on[
- swap_buffer["B"]["RTO"]
+ internals.swap_buffer["B"]["RTO"]
][
- swap_buffer["A"]["values"][x]
+ internals.swap_buffer["A"]["values"][x]
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list