Revision 402038ae
Added by Leszek Koltunski over 3 years ago
| src/main/java/org/distorted/objectlib/main/ObjectControl.java | ||
|---|---|---|
| 736 | 736 |
|
| 737 | 737 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 738 | 738 |
|
| 739 |
public void changeIfDifferent(int ordinal, int meshState, InputStream jsonStream, InputStream meshStream) |
|
| 739 |
public void changeIfDifferent(int ordinal, String oldName, int meshState, InputStream jsonStream, InputStream meshStream)
|
|
| 740 | 740 |
{
|
| 741 | 741 |
TwistyObject object = mPreRender.getObject(); |
| 742 |
ObjectType old = object==null ? null : object.getObjectType();
|
|
| 742 |
String newName = object==null ? "" : object.getShortName();
|
|
| 743 | 743 |
|
| 744 |
if( old==null || old.ordinal() != ordinal || mMeshState!=meshState )
|
|
| 744 |
if( !oldName.equals(newName) || mMeshState!=meshState )
|
|
| 745 | 745 |
{
|
| 746 | 746 |
mMeshState = meshState; |
| 747 | 747 |
mPreRender.changeObject(ordinal, meshState, jsonStream, meshStream); |
Also available in: Unified diff
Downloaded Objects: subtle bugfix. We cannot use ObjectType in ObjectControl to check if two objects are the same because DownloadedObjects have ObjectType null !