- check for animations being present before importing them in ExternalChangeScanner

This commit is contained in:
Normen Hansen 2015-03-10 15:08:57 +01:00
parent b61656ffaa
commit 5ac1d63bb9

View File

@ -130,6 +130,7 @@ public class ExternalChangeScanner implements AssetDataPropertyChangeListener, F
Spatial original = loadOriginalSpatial(); Spatial original = loadOriginalSpatial();
Spatial spat = (Spatial) assetDataObject.loadAsset(); Spatial spat = (Spatial) assetDataObject.loadAsset();
SpatialUtil.updateMeshDataFromOriginal(spat, original); SpatialUtil.updateMeshDataFromOriginal(spat, original);
if (SpatialUtil.hasAnimations(original)) {
NotifyDescriptor.Confirmation mesg = new NotifyDescriptor.Confirmation("Model appears to have animations, try to import as well?\nCurrently this will unlink attachment Nodes and clear\nadded effects tracks.", NotifyDescriptor.Confirmation mesg = new NotifyDescriptor.Confirmation("Model appears to have animations, try to import as well?\nCurrently this will unlink attachment Nodes and clear\nadded effects tracks.",
"Animations Available", "Animations Available",
NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.QUESTION_MESSAGE); NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.QUESTION_MESSAGE);
@ -137,6 +138,7 @@ public class ExternalChangeScanner implements AssetDataPropertyChangeListener, F
if (mesg.getValue() == NotifyDescriptor.Confirmation.YES_OPTION) { if (mesg.getValue() == NotifyDescriptor.Confirmation.YES_OPTION) {
SpatialUtil.updateAnimControlDataFromOriginal(spat, original); SpatialUtil.updateAnimControlDataFromOriginal(spat, original);
} }
}
closeOriginalSpatial(); closeOriginalSpatial();
assetDataObject.saveAsset(); assetDataObject.saveAsset();
} catch (Exception e) { } catch (Exception e) {