Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

This commit is contained in:
Andrzej Kapolka 2014-06-18 13:10:11 -07:00
commit 530852a756

View file

@ -1099,7 +1099,7 @@ function handeMenuEvent(menuItem){
var properties = Models.getModelProperties(editModelID);
var oldValue = properties[propertyName];
var newValue = Window.prompt("New value for: " + propertyName, oldValue);
if (newValue != NULL) {
if (newValue != "") {
properties[propertyName] = newValue;
Models.editModel(editModelID, properties);
}