diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a82fab3d9..dbf849239 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -163,7 +163,7 @@ jobs: New-Item -ItemType Directory -Force -Path $nbmDir # Download the NBM file - Invoke-WebRequest -Uri "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.0/org-opensim-javabrowser.nbm" ` + Invoke-WebRequest -Uri "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.1.dev/org-opensim-javabrowser.nbm" ` -OutFile "$nbmDir\org-opensim-javabrowser.nbm" # Extract the NBM @@ -346,7 +346,7 @@ jobs: run: | # Set root and directories ROOT="$GITHUB_WORKSPACE" - NBM_DIR="$ROOT/prebuilt_jxb" + NBM_DIR="$ROOT/prebuilt_jxb461" EXTRACT_DIR="$NBM_DIR/extracted" INSTALLER_CONTENT="$ROOT/Gui/opensim/dist/installer/opensim/opensim" @@ -354,7 +354,7 @@ jobs: mkdir -p "$NBM_DIR" # Download the NBM file - curl -L "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.0/org-opensim-javabrowser.nbm" \ + curl -L "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.1.dev/org-opensim-javabrowser.nbm" \ -o "$NBM_DIR/org-opensim-javabrowser.nbm" # Extract the NBM (nbm is a zip) @@ -367,7 +367,8 @@ jobs: # Copy the main JAR cp "$EXTRACT_DIR/netbeans/modules/org-opensim-javabrowser.jar" "$INSTALLER_CONTENT/modules/" - + echo "++++++++++++++++++++++++++++++++++++++++++++++++++++" + echo "cp " "$EXTRACT_DIR/netbeans/modules/org-opensim-javabrowser.jar" " to " "$INSTALLER_CONTENT/modules/" # Copy macOS-specific JARs with exact names cp "$EXTRACT_DIR/netbeans/modules/ext/jxbrowser-7.44.1.jar" "$INSTALLER_CONTENT/modules/ext/" cp "$EXTRACT_DIR/netbeans/modules/ext/jxbrowser-swing-7.44.1.jar" "$INSTALLER_CONTENT/modules/ext/" @@ -517,7 +518,7 @@ jobs: # Download the NBM file pinned to version v4.6.0 wget -O "$NBM_DIR/org-opensim-javabrowser.nbm" \ - "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.0/org-opensim-javabrowser.nbm" + "https://github.com/opensim-org/opensim-visualizer/releases/download/v4.6.1.dev/org-opensim-javabrowser.nbm" # Extract the NBM (nbm is a zip) mkdir -p "$EXTRACT_DIR" diff --git a/Gui/opensim/build.xml b/Gui/opensim/build.xml index 9ad77ed12..7b92a19ac 100644 --- a/Gui/opensim/build.xml +++ b/Gui/opensim/build.xml @@ -146,7 +146,7 @@ - diff --git a/Gui/opensim/view/src/org/opensim/view/motions/MotionsDB.java b/Gui/opensim/view/src/org/opensim/view/motions/MotionsDB.java index 874d611b6..5965b6276 100644 --- a/Gui/opensim/view/src/org/opensim/view/motions/MotionsDB.java +++ b/Gui/opensim/view/src/org/opensim/view/motions/MotionsDB.java @@ -207,7 +207,6 @@ public void loadMotionStorage(Storage newMotion, boolean primary, String filePat amot.setName(new File(filePath).getName()); amot.setDataRate(markerData.getDataRate()); amot.setCameraRate(markerData.getCameraRate()); - amot.setModel(model); addMotion(model, amot, primaryMot); } catch (IOException ex) { Exceptions.printStackTrace(ex); diff --git a/opensim-visualizer b/opensim-visualizer index 68cc40bb9..097c005a3 160000 --- a/opensim-visualizer +++ b/opensim-visualizer @@ -1 +1 @@ -Subproject commit 68cc40bb9da6f4f4f267b8323df829c96f172915 +Subproject commit 097c005a3412e1e8f8bdc3c6098511f620deba7b