Skip to content

Commit 3997ded

Browse files
authored
Merge pull request #3359 from phatgolo/fix/group-visibility-undo-redo-3335
Fix group visibility not updating in viewport after undo/redo (#3335)
2 parents 552a69b + e5b4964 commit 3997ded

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

js/outliner/outliner.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,6 @@ Interface.definePanels(function() {
13701370
dragToggle(e1) {
13711371
let [original] = eventTargetToNode(e1.target);
13721372
let affected = [];
1373-
let affected_groups = [];
13741373
let key = e1.target.getAttribute('toggle');
13751374
let previous_values = {};
13761375
let value = original[key];
@@ -1397,7 +1396,6 @@ Interface.definePanels(function() {
13971396

13981397
} else if (!affected.includes(node) && (!node.locked || key == 'locked' || key == 'visibility')) {
13991398
let new_affected = [node];
1400-
if (node instanceof Group) affected_groups.push(node);
14011399
if (node.forEachChild) {
14021400
if (toggle_config.change_children != false) {
14031401
node.forEachChild(node => {
@@ -1428,7 +1426,7 @@ Interface.definePanels(function() {
14281426
})
14291427
Undo.initEdit({
14301428
elements: affected.filter(node => node instanceof OutlinerElement),
1431-
groups: affected_groups,
1429+
groups: affected.filter(node => node instanceof Group),
14321430
mirror_modeling: false
14331431
})
14341432
affected.forEach(node => {

js/preview/canvas.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,9 @@ export const Canvas = {
653653
},
654654
updateVisibility() {
655655
Canvas.updateView({elements: Outliner.elements, element_aspects: {visibility: true}})
656+
Group.all.forEach(group => {
657+
if (group.mesh) group.mesh.visible = group.visibility;
658+
});
656659
},
657660
updateAllFaces(texture) {
658661
Outliner.elements.forEach(function(obj) {

0 commit comments

Comments
 (0)