Skip to content

Commit 4a4a731

Browse files
SG-41606: Create new softDeleted property if it doesn't exist yet (#1046)
### [SG-41606](https://jira.autodesk.com/browse/SG-41606): Create new softDeleted property if it doesn't exist yet ### Summarize your change. Instead of only setting the value of the `softDeleted` property if it exist, we should always make sure the property exist and is updated by the different undo/redo/clear operations. ### Describe the reason for the change. An issue was found in the Live Review plugin where clear actions would not clear the annotations for the other participants if the softDeleted property was not updated by the instance who made the action. The fix for this issue will be part of another PR in the Commercial RV repo, but it also make sense for the annotation tool to always make sure the `softDeleted` property has a value. Signed-off-by: Éloïse Brosseau <eloise.brosseau@autodesk.com>
1 parent 54ec71e commit 4a4a731

1 file changed

Lines changed: 27 additions & 18 deletions

File tree

src/plugins/rv-packages/annotate/annotate_mode.mu

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,10 +1621,11 @@ class: AnnotateMinorMode : MinorMode
16211621
let frame = int(parts[2]);
16221622

16231623
let softDeleted = "%s.%s.softDeleted" % (node, stroke);
1624-
if (propertyExists(softDeleted))
1624+
if (!propertyExists(softDeleted))
16251625
{
1626-
setIntProperty(softDeleted, int[] {0}, true);
1626+
newProperty(softDeleted, IntType, 1);
16271627
}
1628+
setIntProperty(softDeleted, int[] {0}, true);
16281629

16291630
let orderName = frameOrderName(node, frame);
16301631

@@ -1694,10 +1695,11 @@ class: AnnotateMinorMode : MinorMode
16941695
if (stroke != "")
16951696
{
16961697
let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
1697-
if (propertyExists(softDeleted))
1698+
if (!propertyExists(softDeleted))
16981699
{
1699-
setIntProperty(softDeleted, int[] {1}, true);
1700+
newProperty(softDeleted, IntType, 1);
17001701
}
1702+
setIntProperty(softDeleted, int[] {1}, true);
17011703

17021704
for_index(i; order)
17031705
{
@@ -1737,10 +1739,11 @@ class: AnnotateMinorMode : MinorMode
17371739
let stroke = findStrokeByUuid(_currentNode, frame, uuid);
17381740

17391741
let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
1740-
if (propertyExists(softDeleted))
1742+
if (!propertyExists(softDeleted))
17411743
{
1742-
setIntProperty(softDeleted, int[] {0}, true);
1744+
newProperty(softDeleted, IntType, 1);
17431745
}
1746+
setIntProperty(softDeleted, int[] {0}, true);
17441747

17451748
order.push_back(stroke);
17461749
}
@@ -1797,10 +1800,11 @@ class: AnnotateMinorMode : MinorMode
17971800
let frame = int(parts[2]);
17981801

17991802
let softDeleted = "%s.%s.softDeleted" % (node, stroke);
1800-
if (propertyExists(softDeleted))
1803+
if (!propertyExists(softDeleted))
18011804
{
1802-
setIntProperty(softDeleted, int[] {1}, true);
1805+
newProperty(softDeleted, IntType, 1);
18031806
}
1807+
setIntProperty(softDeleted, int[] {1}, true);
18041808

18051809
let orderName = frameOrderName(node, frame);
18061810
if (propertyExists(orderName))
@@ -1876,10 +1880,11 @@ class: AnnotateMinorMode : MinorMode
18761880
if (stroke != "")
18771881
{
18781882
let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
1879-
if (propertyExists(softDeleted))
1883+
if (!propertyExists(softDeleted))
18801884
{
1881-
setIntProperty(softDeleted, int[] {0}, true);
1885+
newProperty(softDeleted, IntType, 1);
18821886
}
1887+
setIntProperty(softDeleted, int[] {0}, true);
18831888

18841889
order.push_back(stroke);
18851890

@@ -1912,10 +1917,11 @@ class: AnnotateMinorMode : MinorMode
19121917
let stroke = findStrokeByUuid(_currentNode, frame, uuid);
19131918

19141919
let softDeleted = "%s.%s.softDeleted" % (_currentNode, stroke);
1915-
if (propertyExists(softDeleted))
1920+
if (!propertyExists(softDeleted))
19161921
{
1917-
setIntProperty(softDeleted, int[] {1}, true);
1922+
newProperty(softDeleted, IntType, 1);
19181923
}
1924+
setIntProperty(softDeleted, int[] {1}, true);
19191925

19201926
for_index(i; order)
19211927
{
@@ -1997,10 +2003,11 @@ class: AnnotateMinorMode : MinorMode
19972003
affectedStrokes.push_back(uuid);
19982004

19992005
let softDeleted = "%s.%s.softDeleted" % (node, stroke);
2000-
if (propertyExists(softDeleted))
2006+
if (!propertyExists(softDeleted))
20012007
{
2002-
setIntProperty(softDeleted, int[] {1}, true);
2008+
newProperty(softDeleted, IntType, 1);
20032009
}
2010+
setIntProperty(softDeleted, int[] {1}, true);
20042011
}
20052012
}
20062013
undo.push_back(string(order.size()));
@@ -2066,10 +2073,11 @@ class: AnnotateMinorMode : MinorMode
20662073
affectedStrokes.push_back(uuid);
20672074

20682075
let softDeleted = "%s.%s.softDeleted" % (node, stroke);
2069-
if (propertyExists(softDeleted))
2076+
if (!propertyExists(softDeleted))
20702077
{
2071-
setIntProperty(softDeleted, int[] {1}, true);
2078+
newProperty(softDeleted, IntType, 1);
20722079
}
2080+
setIntProperty(softDeleted, int[] {1}, true);
20732081
}
20742082
}
20752083

@@ -2095,10 +2103,11 @@ class: AnnotateMinorMode : MinorMode
20952103
affectedStrokes.push_back(uuid);
20962104

20972105
let softDeleted = "%s.%s.softDeleted" % (node, stroke);
2098-
if (propertyExists(softDeleted))
2106+
if (!propertyExists(softDeleted))
20992107
{
2100-
setIntProperty(softDeleted, int[] {1}, true);
2108+
newProperty(softDeleted, IntType, 1);
21012109
}
2110+
setIntProperty(softDeleted, int[] {1}, true);
21022111
}
21032112
}
21042113

0 commit comments

Comments
 (0)