Просмотр исходного кода

Fixed linked entities not reloading properly on change in the IDE screen editor

Ivan Safrin 12 лет назад
Родитель
Сommit
2b05a2ef86
1 измененных файлов с 7 добавлено и 6 удалено
  1. 7 6
      IDE/Contents/Source/PolycodeScreenEditor.cpp

+ 7 - 6
IDE/Contents/Source/PolycodeScreenEditor.cpp

@@ -1962,18 +1962,19 @@ void PolycodeScreenEditorMain::deleteEntity(ScreenEntity *entity) {
 
 void PolycodeScreenEditorMain::handleEvent(Event *event) {
 
-	if(!editor->enabled)
-		return;
-		
-	InputEvent *inputEvent = (InputEvent*) event;
-	
 	if(event->getEventCode() == Event::RESOURCE_RELOAD_EVENT && event->getEventType() == "") {
 			ScreenEntityInstanceResourceEntry *entry = dynamic_cast<ScreenEntityInstanceResourceEntry*>(event->getDispatcher());
 			if(entry) {	
 				applyEditorProperties(entry->getInstance());
 				applyEditorOnlyChildren(entry->getInstance());				
 			}
-	} else if(event->getEventCode() == UIEvent::CHANGE_EVENT && event->getEventType() == "UIEvent") {
+	}
+	
+	if(!editor->enabled)
+		return;		
+
+	InputEvent *inputEvent = (InputEvent*) event;		
+	if(event->getEventCode() == UIEvent::CHANGE_EVENT && event->getEventType() == "UIEvent") {
 
 
 		if(event->getDispatcher() == pixelSnapBox) {