Revision: 20647
          http://sourceforge.net/p/jmol/code/20647
Author:   hansonr
Date:     2015-07-10 02:14:50 +0000 (Fri, 10 Jul 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.15_2015.07.09"

bug fix: load "xxx" 1 {10 10 10} does not recognize lattice information when 
model number is given (broken in 07.07)

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/ScriptEval.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java      2015-07-09 04:37:42 UTC 
(rev 20646)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java      2015-07-10 02:14:50 UTC 
(rev 20647)
@@ -4429,7 +4429,7 @@
       case T.varray:
       case T.leftsquare:
       case T.spacebeforesquare:
-        tok = tokAt(getLoadModelIndex(i, sOptions, htParams));
+        i = getLoadModelIndex(i, sOptions, htParams);
         break;
       }
       i = getCmdExt().getLoadSymmetryParams(i, sOptions, htParams);
@@ -4776,7 +4776,6 @@
     case T.spacebeforesquare:
       htParams.remove("firstLastStep");
       float[] data = floatParameterSet(i, 1, Integer.MAX_VALUE);
-      i = iToken;
       BS bs = new BS();
       int[] iArray = new int[data.length];
       for (int j = 0; j < data.length; j++) {

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2015-07-09 04:37:42 UTC 
(rev 20646)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2015-07-10 02:14:50 UTC 
(rev 20647)
@@ -48,8 +48,12 @@
 
 TODO: there is something wrong with JSmol and zoneDemo. Just slow? or what?
 
-Jmol.___JmolVersion="14.3.15_2015.07.08c"
+Jmol.___JmolVersion="14.3.15_2015.07.09"
 
+bug fix: load "xxx" 1 {10 10 10} does not recognize lattice information when 
model number is given (broken in 07.07)
+
+JmolVersion="14.3.15_2015.07.08c"
+
 bug fix: load files "xxx.png|xxxx" "xxx.png|zzzz"  not read from state properly
 bug fix: polyhedra not saved in state property
 bug fix: moving atoms with 4x4 matrix not saved in state

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to