From: <ha...@us...> - 2007-04-18 06:25:54
|
Revision: 7435 http://svn.sourceforge.net/jmol/?rev=7435&view=rev Author: hansonr Date: 2007-04-17 23:25:52 -0700 (Tue, 17 Apr 2007) Log Message: ----------- 11.1.29 isosurface lcaoCartoon bug fix Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Isosurface.java trunk/Jmol/src/org/jmol/viewer/MeshCollection.java Modified: trunk/Jmol/src/org/jmol/viewer/Isosurface.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Isosurface.java 2007-04-18 05:54:27 UTC (rev 7434) +++ trunk/Jmol/src/org/jmol/viewer/Isosurface.java 2007-04-18 06:25:52 UTC (rev 7435) @@ -640,6 +640,8 @@ } if ("lcaoCartoon" == propertyName) { + if (!explicitID) + setPropertySuper("thisID", null, null); if (++state != STATE_DATA_READ) return; Vector3f[] info = (Vector3f[]) value; Modified: trunk/Jmol/src/org/jmol/viewer/MeshCollection.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/MeshCollection.java 2007-04-18 05:54:27 UTC (rev 7434) +++ trunk/Jmol/src/org/jmol/viewer/MeshCollection.java 2007-04-18 06:25:52 UTC (rev 7435) @@ -99,7 +99,7 @@ if ("thisID" == propertyName) { String id = (String) value; setMesh(id); - explicitID = !id.equals(Mesh.PREVIOUS_MESH_ID); + explicitID = id != null && !id.equals(Mesh.PREVIOUS_MESH_ID); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |