From: <ha...@us...> - 2014-03-23 12:40:10
|
Revision: 19514 http://sourceforge.net/p/jmol/code/19514 Author: hansonr Date: 2014-03-23 12:40:06 +0000 (Sun, 23 Mar 2014) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java trunk/Jmol/src/org/jmol/viewer/JC.java Modified: trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2014-03-23 12:18:42 UTC (rev 19513) +++ trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2014-03-23 12:40:06 UTC (rev 19514) @@ -675,9 +675,6 @@ // immediate operation check: switch (op.tok) { case T.propselector: - if (!doSelections) { - - } return (((op.intValue & ~T.minmaxmask) == T.function && op.intValue != T.function)? evaluateFunction(T.nada) : true); case T.plusPlus: Modified: trunk/Jmol/src/org/jmol/viewer/JC.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JC.java 2014-03-23 12:18:42 UTC (rev 19513) +++ trunk/Jmol/src/org/jmol/viewer/JC.java 2014-03-23 12:40:06 UTC (rev 19514) @@ -72,7 +72,7 @@ try { // Reading version from resource inside jar is = JC.class.getClassLoader().getResourceAsStream( - "org/jmol/vwr/Jmol.properties"); + "org/jmol/viewer/Jmol.properties"); bis = new BufferedInputStream(is); Properties props = new Properties(); props.load(bis); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |