do not auto-layout when returning to arrange mode from another mode
This commit is contained in:
parent
99b2d4a021
commit
968b7d0a0a
1 changed files with 7 additions and 0 deletions
|
|
@ -1587,6 +1587,7 @@ self.kiri.license = exports.LICENSE;
|
||||||
var layout = (viewMode === VIEWS.ARRANGE),
|
var layout = (viewMode === VIEWS.ARRANGE),
|
||||||
proc = settings.process,
|
proc = settings.process,
|
||||||
modified = false,
|
modified = false,
|
||||||
|
oldmode = viewMode,
|
||||||
topZ = MODE === MODES.CAM ? camTopZ : 0;
|
topZ = MODE === MODES.CAM ? camTopZ : 0;
|
||||||
|
|
||||||
switch (MODE) {
|
switch (MODE) {
|
||||||
|
|
@ -1602,6 +1603,12 @@ self.kiri.license = exports.LICENSE;
|
||||||
setViewMode(VIEWS.ARRANGE);
|
setViewMode(VIEWS.ARRANGE);
|
||||||
hideSlices();
|
hideSlices();
|
||||||
|
|
||||||
|
// only auto-layout when in arrange mode
|
||||||
|
if (oldmode !== VIEWS.ARRANGE) {
|
||||||
|
SPACE.update();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// do not layout when switching back from slice view
|
// do not layout when switching back from slice view
|
||||||
if (!space && !layout) return SPACE.update();
|
if (!space && !layout) return SPACE.update();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue