Skip to content

Commit ed8496a

Browse files
committed
Add migrations
1 parent 5055721 commit ed8496a

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

dmx.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ def reset_live_dmx_data(self, context):
480480

481481
data_version: IntProperty(
482482
name = "BlenderDMX data version, bump when changing RNA structure and provide migration script",
483-
default = 12,
483+
default = 13,
484484
)
485485

486486
def get_fixture_by_index(self, index):
@@ -957,6 +957,14 @@ def findGroupUuidDuplicates(uuid):
957957
del fixture_["address"]
958958
del fixture_["universe"]
959959

960+
if file_data_version < 13:
961+
DMX_Log.log.info("Running migration 12→13")
962+
dmx = bpy.context.scene.dmx
963+
964+
# we added proper fixture name
965+
for fixture_ in dmx.fixtures:
966+
fixture_.user_fixture_name = fixture_.name
967+
960968
# add here another if statement for next migration condition... like:
961969
# if file_data_version < 6:
962970
# ...
@@ -991,7 +999,7 @@ def onDisplayLabel(self, context):
991999
if self.display_device_label == "NONE":
9921000
obj.show_name = False
9931001
elif self.display_device_label == "NAME":
994-
obj.name = f"{fixture_.name}"
1002+
obj.name = f"{fixture_.user_fixture_name}"
9951003
obj.show_name = self.enable_device_label
9961004
elif self.display_device_label == "DMX":
9971005
obj.name = f"{fixture_.dmx_breaks[0].universe}.{fixture_.dmx_breaks[0].address}"
@@ -1044,7 +1052,7 @@ def onDisplay2D(self, context):
10441052
if self.display_device_label == "NONE":
10451053
obj.show_name = False
10461054
elif self.display_device_label == "NAME":
1047-
obj.name = f"{fixture_.name}"
1055+
obj.name = f"{fixture_.user_fixture_name}"
10481056
obj.show_name = True
10491057
elif self.display_device_label == "DMX":
10501058
obj.name = f"{fixture_.dmx_breaks[0].universe}.{fixture_.dmx_breaks[0].address}"

fixture.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,13 @@ class DMX_Fixture(PropertyGroup):
419419
description="User definable fixture name, can be non-unique, is for MVR export and all UI",
420420
default = "")
421421

422+
name: StringProperty(
423+
name = "Collection name",
424+
description="Not for the user",
425+
default = "")
426+
# this used to be the fixture name, we now only use it for the collection and we rename it
427+
# if the gdtf_profile changes
428+
422429
gdtf_long_name: StringProperty(
423430
name = "Fixture > Name",
424431
default = "")

0 commit comments

Comments
 (0)