diff --git a/src/art/webgl/art.js b/src/art/webgl/art.js index c1472a6aca315677e6916578976e43417f006944..f10e2b8de9077369d2faa40d64171f39d11ca1f6 100644 --- a/src/art/webgl/art.js +++ b/src/art/webgl/art.js @@ -2156,18 +2156,15 @@ App.Art.applyMorphs = function(slave, scene, p, isAnimating) { if (scene.inspect) { morphs.push(["posesInspect2", 1]); morphs.push(["posesInspectGen2", 1]); - } else if (slave.devotion > 50) { - morphs.push(["posesHigh", 1]); - if (p.applyExtremeHeels || p.applyExtremeHeels2) { - morphs.push(["posesLegsClosed", -0.5]); - } - } else if (slave.devotion > -20) { - morphs.push(["posesMid", 1]); } else { - morphs.push(["posesLow", 1]); - } - - if (!scene.inspect) { + if (slave.devotion > 50) { + morphs.push(["posesHigh", 1]); + } else if (slave.devotion > -20) { + morphs.push(["posesMid", 1]); + } else { + morphs.push(["posesLow", 1]); + } + if (slave.scrotum > 20) { if (slave.devotion <= 50) { morphs.push(["posesArmsDown", Math.max(Math.min(-slave.weight/300/3.5, -slave.scrotum/200), -0.5)]); @@ -2183,7 +2180,7 @@ App.Art.applyMorphs = function(slave, scene, p, isAnimating) { morphs.push(["posesArmsDown", Math.max(-slave.weight/300/3.5, -0.5)]); } - if (p.applyExtremeHeels || p.applyExtremeHeels2 && !scene.inspect) { + if (p.applyExtremeHeels || p.applyExtremeHeels2) { morphs.push(["posesLegsClosed", Math.max(-slave.weight/300/3.5 - 0.5, -1.5)]); } else { morphs.push(["posesLegsClosed", Math.max(-slave.weight/300/3.5, -1.5)]); diff --git a/src/art/webgl/ui.js b/src/art/webgl/ui.js index 53f59e6f7bab31839be637b77f64787d939cc6a0..9bb5353c4f9518a5de587b5f21064bde85dd3f82 100644 --- a/src/art/webgl/ui.js +++ b/src/art/webgl/ui.js @@ -96,10 +96,12 @@ App.Art.createWebglUI = function(container, slave, artSize, scene, p) { function inspectView(e) { updateLinkedButtons("inspect"); - view.yr = 0; - view.inspect = true; - App.Art.Frame(slave, scene, view, p); - render(); + if (!V.seeAnimation) { + view.yr = 0; + view.inspect = true; + App.Art.Frame(slave, scene, view, p); + render(); + } } function lockView(e) {