Rename editor -> editors/xrWeatherEditor.

OpenXRay · Oct 18, 2014 · 8277a19 · 8277a19
1 parent d4128a2
commit 8277a19
Show file tree

Hide file tree

Showing 169 changed files with 50 additions and 49 deletions.
diff --git a/src/editor/AssemblyInfo.cpp → src/editors/xrWeatherEditor/AssemblyInfo.cpp b/src/editor/AssemblyInfo.cpp → src/editors/xrWeatherEditor/AssemblyInfo.cpp
@@ -11,11 +11,11 @@ using namespace System::Security::Permissions;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly:AssemblyTitleAttribute("editor")];
+[assembly:AssemblyTitleAttribute("xrWeatherEditor")];
 [assembly:AssemblyDescriptionAttribute("")];
 [assembly:AssemblyConfigurationAttribute("")];
 [assembly:AssemblyCompanyAttribute("GSC Game World")];
-[assembly:AssemblyProductAttribute("editor")];
+[assembly:AssemblyProductAttribute("xrWeatherEditor")];
 [assembly:AssemblyCopyrightAttribute("Copyright (c) GSC Game World 2008")];
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];

diff --git a/src/editor/engine_include.hpp → ...ditors/xrWeatherEditor/engine_include.hpp b/src/editor/engine_include.hpp → ...ditors/xrWeatherEditor/engine_include.hpp
@@ -11,7 +11,7 @@
 
 #pragma unmanaged
 #include <windows.h>
-#include "../include/editor/engine.hpp"
+#include "include/editor/engine.hpp"
 #pragma managed
 
 #endif // #ifndef ENGINE_INCLUDE_HPP_INCLUDED
diff --git a/src/editor/entry_point.cpp → src/editors/xrWeatherEditor/entry_point.cpp b/src/editor/entry_point.cpp → src/editors/xrWeatherEditor/entry_point.cpp
@@ -2,7 +2,7 @@
 
 #pragma unmanaged
 #include <windows.h>
-#include "../Include/editor/engine.hpp"
+#include "Include/editor/engine.hpp"
 #include "ide_impl.hpp"
 #pragma managed
 

diff --git a/src/editor/ide_impl.cpp → src/editors/xrWeatherEditor/ide_impl.cpp b/src/editor/ide_impl.cpp → src/editors/xrWeatherEditor/ide_impl.cpp
@@ -13,7 +13,7 @@
 #include "window_levels.h"
 #include "window_weather.h"
 #include "window_weather_editor.h"
-#include "../include/editor/engine.hpp"
+#include "include/editor/engine.hpp"
 #include "property_holder.hpp"
 #include "property_container.hpp"
 #include "property_holder_include.hpp"

diff --git a/src/editor/ide_impl.hpp → src/editors/xrWeatherEditor/ide_impl.hpp b/src/editor/ide_impl.hpp → src/editors/xrWeatherEditor/ide_impl.hpp
@@ -11,9 +11,9 @@
 
 #pragma unmanaged
 #include <windows.h>
-#include "../xrcore/fastdelegate.h"
+#include "xrcore/fastdelegate.h"
 #include <utility>
-#include "../include/editor/ide.hpp"
+#include "include/editor/ide.hpp"
 #pragma managed
 
 #include <vcclr.h>

diff --git a/src/editor/images/color_picker.cur → ...s/xrWeatherEditor/images/color_picker.cur b/src/editor/images/color_picker.cur → ...s/xrWeatherEditor/images/color_picker.cur
diff --git a/src/editor/images/delete.bmp → ...editors/xrWeatherEditor/images/delete.bmp b/src/editor/images/delete.bmp → ...editors/xrWeatherEditor/images/delete.bmp
diff --git a/src/editor/images/eye.bmp → src/editors/xrWeatherEditor/images/eye.bmp b/src/editor/images/eye.bmp → src/editors/xrWeatherEditor/images/eye.bmp
diff --git a/src/editor/images/filter_closed.bmp → .../xrWeatherEditor/images/filter_closed.bmp b/src/editor/images/filter_closed.bmp → .../xrWeatherEditor/images/filter_closed.bmp
diff --git a/src/editor/images/filter_opened.bmp → .../xrWeatherEditor/images/filter_opened.bmp b/src/editor/images/filter_opened.bmp → .../xrWeatherEditor/images/filter_opened.bmp
diff --git a/src/editor/pch.cpp → src/editors/xrWeatherEditor/pch.cpp b/src/editor/pch.cpp → src/editors/xrWeatherEditor/pch.cpp
diff --git a/src/editor/pch.hpp → src/editors/xrWeatherEditor/pch.hpp b/src/editor/pch.hpp → src/editors/xrWeatherEditor/pch.hpp
diff --git a/src/editor/property_boolean.cpp → ...tors/xrWeatherEditor/property_boolean.cpp b/src/editor/property_boolean.cpp → ...tors/xrWeatherEditor/property_boolean.cpp
diff --git a/src/editor/property_boolean.hpp → ...tors/xrWeatherEditor/property_boolean.hpp b/src/editor/property_boolean.hpp → ...tors/xrWeatherEditor/property_boolean.hpp
diff --git a/src/editor/property_boolean_reference.cpp → ...therEditor/property_boolean_reference.cpp b/src/editor/property_boolean_reference.cpp → ...therEditor/property_boolean_reference.cpp
diff --git a/src/editor/property_boolean_reference.hpp → ...therEditor/property_boolean_reference.hpp b/src/editor/property_boolean_reference.hpp → ...therEditor/property_boolean_reference.hpp
diff --git a/src/editor/property_boolean_values_value.cpp → ...rEditor/property_boolean_values_value.cpp b/src/editor/property_boolean_values_value.cpp → ...rEditor/property_boolean_values_value.cpp
diff --git a/src/editor/property_boolean_values_value.hpp → ...rEditor/property_boolean_values_value.hpp b/src/editor/property_boolean_values_value.hpp → ...rEditor/property_boolean_values_value.hpp
diff --git a/...operty_boolean_values_value_reference.cpp → ...operty_boolean_values_value_reference.cpp b/...operty_boolean_values_value_reference.cpp → ...operty_boolean_values_value_reference.cpp
diff --git a/...operty_boolean_values_value_reference.hpp → ...operty_boolean_values_value_reference.hpp b/...operty_boolean_values_value_reference.hpp → ...operty_boolean_values_value_reference.hpp
diff --git a/src/editor/property_collection.cpp → ...s/xrWeatherEditor/property_collection.cpp b/src/editor/property_collection.cpp → ...s/xrWeatherEditor/property_collection.cpp
diff --git a/src/editor/property_collection.hpp → ...s/xrWeatherEditor/property_collection.hpp b/src/editor/property_collection.hpp → ...s/xrWeatherEditor/property_collection.hpp
diff --git a/src/editor/property_collection_base.cpp → ...eatherEditor/property_collection_base.cpp b/src/editor/property_collection_base.cpp → ...eatherEditor/property_collection_base.cpp
diff --git a/src/editor/property_collection_base.hpp → ...eatherEditor/property_collection_base.hpp b/src/editor/property_collection_base.hpp → ...eatherEditor/property_collection_base.hpp
diff --git a/src/editor/property_collection_converter.cpp → ...rEditor/property_collection_converter.cpp b/src/editor/property_collection_converter.cpp → ...rEditor/property_collection_converter.cpp
diff --git a/src/editor/property_collection_converter.hpp → ...rEditor/property_collection_converter.hpp b/src/editor/property_collection_converter.hpp → ...rEditor/property_collection_converter.hpp
diff --git a/src/editor/property_collection_editor.cpp → ...therEditor/property_collection_editor.cpp b/src/editor/property_collection_editor.cpp → ...therEditor/property_collection_editor.cpp
diff --git a/src/editor/property_collection_editor.hpp → ...therEditor/property_collection_editor.hpp b/src/editor/property_collection_editor.hpp → ...therEditor/property_collection_editor.hpp
diff --git a/...editor/property_collection_enumerator.cpp → ...Editor/property_collection_enumerator.cpp b/...editor/property_collection_enumerator.cpp → ...Editor/property_collection_enumerator.cpp
diff --git a/...editor/property_collection_enumerator.hpp → ...Editor/property_collection_enumerator.hpp b/...editor/property_collection_enumerator.hpp → ...Editor/property_collection_enumerator.hpp
diff --git a/src/editor/property_collection_getter.cpp → ...therEditor/property_collection_getter.cpp b/src/editor/property_collection_getter.cpp → ...therEditor/property_collection_getter.cpp
diff --git a/src/editor/property_collection_getter.hpp → ...therEditor/property_collection_getter.hpp b/src/editor/property_collection_getter.hpp → ...therEditor/property_collection_getter.hpp
diff --git a/src/editor/property_color.cpp → ...ditors/xrWeatherEditor/property_color.cpp b/src/editor/property_color.cpp → ...ditors/xrWeatherEditor/property_color.cpp
diff --git a/src/editor/property_color.hpp → ...ditors/xrWeatherEditor/property_color.hpp b/src/editor/property_color.hpp → ...ditors/xrWeatherEditor/property_color.hpp
diff --git a/src/editor/property_color_base.cpp → ...s/xrWeatherEditor/property_color_base.cpp b/src/editor/property_color_base.cpp → ...s/xrWeatherEditor/property_color_base.cpp
diff --git a/src/editor/property_color_base.hpp → ...s/xrWeatherEditor/property_color_base.hpp b/src/editor/property_color_base.hpp → ...s/xrWeatherEditor/property_color_base.hpp
diff --git a/src/editor/property_color_reference.cpp → ...eatherEditor/property_color_reference.cpp b/src/editor/property_color_reference.cpp → ...eatherEditor/property_color_reference.cpp
diff --git a/src/editor/property_color_reference.hpp → ...eatherEditor/property_color_reference.hpp b/src/editor/property_color_reference.hpp → ...eatherEditor/property_color_reference.hpp
diff --git a/src/editor/property_container.cpp → ...rs/xrWeatherEditor/property_container.cpp b/src/editor/property_container.cpp → ...rs/xrWeatherEditor/property_container.cpp
diff --git a/src/editor/property_container.hpp → ...rs/xrWeatherEditor/property_container.hpp b/src/editor/property_container.hpp → ...rs/xrWeatherEditor/property_container.hpp
diff --git a/src/editor/property_container_converter.cpp → ...erEditor/property_container_converter.cpp b/src/editor/property_container_converter.cpp → ...erEditor/property_container_converter.cpp
diff --git a/src/editor/property_container_converter.hpp → ...erEditor/property_container_converter.hpp b/src/editor/property_container_converter.hpp → ...erEditor/property_container_converter.hpp
diff --git a/src/editor/property_container_holder.hpp → ...atherEditor/property_container_holder.hpp b/src/editor/property_container_holder.hpp → ...atherEditor/property_container_holder.hpp
diff --git a/...tor/property_converter_boolean_values.cpp → ...tor/property_converter_boolean_values.cpp b/...tor/property_converter_boolean_values.cpp → ...tor/property_converter_boolean_values.cpp
diff --git a/...tor/property_converter_boolean_values.hpp → ...tor/property_converter_boolean_values.hpp b/...tor/property_converter_boolean_values.hpp → ...tor/property_converter_boolean_values.hpp
diff --git a/src/editor/property_converter_color.cpp → ...eatherEditor/property_converter_color.cpp b/src/editor/property_converter_color.cpp → ...eatherEditor/property_converter_color.cpp
diff --git a/src/editor/property_converter_color.hpp → ...eatherEditor/property_converter_color.hpp b/src/editor/property_converter_color.hpp → ...eatherEditor/property_converter_color.hpp
diff --git a/src/editor/property_converter_float.cpp → ...eatherEditor/property_converter_float.cpp b/src/editor/property_converter_float.cpp → ...eatherEditor/property_converter_float.cpp
diff --git a/src/editor/property_converter_float.hpp → ...eatherEditor/property_converter_float.hpp b/src/editor/property_converter_float.hpp → ...eatherEditor/property_converter_float.hpp
diff --git a/src/editor/property_converter_float_enum.cpp → ...rEditor/property_converter_float_enum.cpp b/src/editor/property_converter_float_enum.cpp → ...rEditor/property_converter_float_enum.cpp
diff --git a/src/editor/property_converter_float_enum.hpp → ...rEditor/property_converter_float_enum.hpp b/src/editor/property_converter_float_enum.hpp → ...rEditor/property_converter_float_enum.hpp
diff --git a/...ditor/property_converter_integer_enum.cpp → ...ditor/property_converter_integer_enum.cpp b/...ditor/property_converter_integer_enum.cpp → ...ditor/property_converter_integer_enum.cpp
diff --git a/...ditor/property_converter_integer_enum.hpp → ...ditor/property_converter_integer_enum.hpp b/...ditor/property_converter_integer_enum.hpp → ...ditor/property_converter_integer_enum.hpp
diff --git a/...tor/property_converter_integer_values.cpp → ...tor/property_converter_integer_values.cpp b/...tor/property_converter_integer_values.cpp → ...tor/property_converter_integer_values.cpp
diff --git a/...tor/property_converter_integer_values.hpp → ...tor/property_converter_integer_values.hpp b/...tor/property_converter_integer_values.hpp → ...tor/property_converter_integer_values.hpp
diff --git a/...itor/property_converter_string_values.cpp → ...itor/property_converter_string_values.cpp b/...itor/property_converter_string_values.cpp → ...itor/property_converter_string_values.cpp
diff --git a/...itor/property_converter_string_values.hpp → ...itor/property_converter_string_values.hpp b/...itor/property_converter_string_values.hpp → ...itor/property_converter_string_values.hpp
diff --git a/...editor/property_converter_tree_values.cpp → ...Editor/property_converter_tree_values.cpp b/...editor/property_converter_tree_values.cpp → ...Editor/property_converter_tree_values.cpp
diff --git a/...editor/property_converter_tree_values.hpp → ...Editor/property_converter_tree_values.hpp b/...editor/property_converter_tree_values.hpp → ...Editor/property_converter_tree_values.hpp
diff --git a/src/editor/property_converter_vec3f.cpp → ...eatherEditor/property_converter_vec3f.cpp b/src/editor/property_converter_vec3f.cpp → ...eatherEditor/property_converter_vec3f.cpp
diff --git a/src/editor/property_converter_vec3f.hpp → ...eatherEditor/property_converter_vec3f.hpp b/src/editor/property_converter_vec3f.hpp → ...eatherEditor/property_converter_vec3f.hpp
diff --git a/src/editor/property_editor_color.cpp → ...xrWeatherEditor/property_editor_color.cpp b/src/editor/property_editor_color.cpp → ...xrWeatherEditor/property_editor_color.cpp
diff --git a/src/editor/property_editor_color.hpp → ...xrWeatherEditor/property_editor_color.hpp b/src/editor/property_editor_color.hpp → ...xrWeatherEditor/property_editor_color.hpp
diff --git a/src/editor/property_editor_file_name.cpp → ...atherEditor/property_editor_file_name.cpp b/src/editor/property_editor_file_name.cpp → ...atherEditor/property_editor_file_name.cpp
diff --git a/src/editor/property_editor_file_name.hpp → ...atherEditor/property_editor_file_name.hpp b/src/editor/property_editor_file_name.hpp → ...atherEditor/property_editor_file_name.hpp
diff --git a/src/editor/property_editor_tree_values.cpp → ...herEditor/property_editor_tree_values.cpp b/src/editor/property_editor_tree_values.cpp → ...herEditor/property_editor_tree_values.cpp
diff --git a/src/editor/property_editor_tree_values.hpp → ...herEditor/property_editor_tree_values.hpp b/src/editor/property_editor_tree_values.hpp → ...herEditor/property_editor_tree_values.hpp
diff --git a/src/editor/property_file_name_value.cpp → ...eatherEditor/property_file_name_value.cpp b/src/editor/property_file_name_value.cpp → ...eatherEditor/property_file_name_value.cpp
diff --git a/src/editor/property_file_name_value.hpp → ...eatherEditor/property_file_name_value.hpp b/src/editor/property_file_name_value.hpp → ...eatherEditor/property_file_name_value.hpp
diff --git a/src/editor/property_file_name_value_base.hpp → ...rEditor/property_file_name_value_base.hpp b/src/editor/property_file_name_value_base.hpp → ...rEditor/property_file_name_value_base.hpp
diff --git a/...r/property_file_name_value_shared_str.cpp → ...r/property_file_name_value_shared_str.cpp b/...r/property_file_name_value_shared_str.cpp → ...r/property_file_name_value_shared_str.cpp
diff --git a/...r/property_file_name_value_shared_str.hpp → ...r/property_file_name_value_shared_str.hpp b/...r/property_file_name_value_shared_str.hpp → ...r/property_file_name_value_shared_str.hpp
diff --git a/src/editor/property_float.cpp → ...ditors/xrWeatherEditor/property_float.cpp b/src/editor/property_float.cpp → ...ditors/xrWeatherEditor/property_float.cpp
diff --git a/src/editor/property_float.hpp → ...ditors/xrWeatherEditor/property_float.hpp b/src/editor/property_float.hpp → ...ditors/xrWeatherEditor/property_float.hpp
diff --git a/src/editor/property_float_enum_value.cpp → ...atherEditor/property_float_enum_value.cpp b/src/editor/property_float_enum_value.cpp → ...atherEditor/property_float_enum_value.cpp
diff --git a/src/editor/property_float_enum_value.hpp → ...atherEditor/property_float_enum_value.hpp b/src/editor/property_float_enum_value.hpp → ...atherEditor/property_float_enum_value.hpp
diff --git a/...r/property_float_enum_value_reference.cpp → ...r/property_float_enum_value_reference.cpp b/...r/property_float_enum_value_reference.cpp → ...r/property_float_enum_value_reference.cpp
diff --git a/...r/property_float_enum_value_reference.hpp → ...r/property_float_enum_value_reference.hpp b/...r/property_float_enum_value_reference.hpp → ...r/property_float_enum_value_reference.hpp
diff --git a/src/editor/property_float_limited.cpp → ...rWeatherEditor/property_float_limited.cpp b/src/editor/property_float_limited.cpp → ...rWeatherEditor/property_float_limited.cpp
diff --git a/src/editor/property_float_limited.hpp → ...rWeatherEditor/property_float_limited.hpp b/src/editor/property_float_limited.hpp → ...rWeatherEditor/property_float_limited.hpp
diff --git a/...itor/property_float_limited_reference.cpp → ...itor/property_float_limited_reference.cpp b/...itor/property_float_limited_reference.cpp → ...itor/property_float_limited_reference.cpp
diff --git a/...itor/property_float_limited_reference.hpp → ...itor/property_float_limited_reference.hpp b/...itor/property_float_limited_reference.hpp → ...itor/property_float_limited_reference.hpp
diff --git a/src/editor/property_float_reference.cpp → ...eatherEditor/property_float_reference.cpp b/src/editor/property_float_reference.cpp → ...eatherEditor/property_float_reference.cpp
diff --git a/src/editor/property_float_reference.hpp → ...eatherEditor/property_float_reference.hpp b/src/editor/property_float_reference.hpp → ...eatherEditor/property_float_reference.hpp
diff --git a/src/editor/property_holder.cpp → ...itors/xrWeatherEditor/property_holder.cpp b/src/editor/property_holder.cpp → ...itors/xrWeatherEditor/property_holder.cpp
diff --git a/src/editor/property_holder.hpp → ...itors/xrWeatherEditor/property_holder.hpp b/src/editor/property_holder.hpp → ...itors/xrWeatherEditor/property_holder.hpp
diff --git a/src/editor/property_holder_boolean.cpp → ...WeatherEditor/property_holder_boolean.cpp b/src/editor/property_holder_boolean.cpp → ...WeatherEditor/property_holder_boolean.cpp
diff --git a/src/editor/property_holder_collection.cpp → ...therEditor/property_holder_collection.cpp b/src/editor/property_holder_collection.cpp → ...therEditor/property_holder_collection.cpp
diff --git a/src/editor/property_holder_color.cpp → ...xrWeatherEditor/property_holder_color.cpp b/src/editor/property_holder_color.cpp → ...xrWeatherEditor/property_holder_color.cpp
diff --git a/src/editor/property_holder_container.cpp → ...atherEditor/property_holder_container.cpp b/src/editor/property_holder_container.cpp → ...atherEditor/property_holder_container.cpp
diff --git a/src/editor/property_holder_float.cpp → ...xrWeatherEditor/property_holder_float.cpp b/src/editor/property_holder_float.cpp → ...xrWeatherEditor/property_holder_float.cpp
diff --git a/src/editor/property_holder_include.hpp → ...WeatherEditor/property_holder_include.hpp b/src/editor/property_holder_include.hpp → ...WeatherEditor/property_holder_include.hpp
@@ -11,9 +11,9 @@
 
 #pragma unmanaged
 #include <boost/noncopyable.hpp>
-#include "../xrcore/fastdelegate.h"
+#include "xrcore/fastdelegate.h"
 #include <utility>
-#include "../include/editor/property_holder.hpp"
+#include "include/editor/property_holder.hpp"
 #pragma managed
 
 generic <typename type0, typename type1>

diff --git a/src/editor/property_holder_integer.cpp → ...WeatherEditor/property_holder_integer.cpp b/src/editor/property_holder_integer.cpp → ...WeatherEditor/property_holder_integer.cpp
diff --git a/src/editor/property_holder_string.cpp → ...rWeatherEditor/property_holder_string.cpp b/src/editor/property_holder_string.cpp → ...rWeatherEditor/property_holder_string.cpp
diff --git a/src/editor/property_holder_vec3f.cpp → ...xrWeatherEditor/property_holder_vec3f.cpp b/src/editor/property_holder_vec3f.cpp → ...xrWeatherEditor/property_holder_vec3f.cpp
diff --git a/src/editor/property_integer.cpp → ...tors/xrWeatherEditor/property_integer.cpp b/src/editor/property_integer.cpp → ...tors/xrWeatherEditor/property_integer.cpp
diff --git a/src/editor/property_integer.hpp → ...tors/xrWeatherEditor/property_integer.hpp b/src/editor/property_integer.hpp → ...tors/xrWeatherEditor/property_integer.hpp
diff --git a/src/editor/property_integer_enum_value.cpp → ...herEditor/property_integer_enum_value.cpp b/src/editor/property_integer_enum_value.cpp → ...herEditor/property_integer_enum_value.cpp
diff --git a/src/editor/property_integer_enum_value.hpp → ...herEditor/property_integer_enum_value.hpp b/src/editor/property_integer_enum_value.hpp → ...herEditor/property_integer_enum_value.hpp
diff --git a/...property_integer_enum_value_reference.cpp → ...property_integer_enum_value_reference.cpp b/...property_integer_enum_value_reference.cpp → ...property_integer_enum_value_reference.cpp
diff --git a/...property_integer_enum_value_reference.hpp → ...property_integer_enum_value_reference.hpp b/...property_integer_enum_value_reference.hpp → ...property_integer_enum_value_reference.hpp
diff --git a/src/editor/property_integer_limited.cpp → ...eatherEditor/property_integer_limited.cpp b/src/editor/property_integer_limited.cpp → ...eatherEditor/property_integer_limited.cpp
diff --git a/src/editor/property_integer_limited.hpp → ...eatherEditor/property_integer_limited.hpp b/src/editor/property_integer_limited.hpp → ...eatherEditor/property_integer_limited.hpp
diff --git a/...or/property_integer_limited_reference.cpp → ...or/property_integer_limited_reference.cpp b/...or/property_integer_limited_reference.cpp → ...or/property_integer_limited_reference.cpp
diff --git a/...or/property_integer_limited_reference.hpp → ...or/property_integer_limited_reference.hpp b/...or/property_integer_limited_reference.hpp → ...or/property_integer_limited_reference.hpp
diff --git a/src/editor/property_integer_reference.cpp → ...therEditor/property_integer_reference.cpp b/src/editor/property_integer_reference.cpp → ...therEditor/property_integer_reference.cpp
diff --git a/src/editor/property_integer_reference.hpp → ...therEditor/property_integer_reference.hpp b/src/editor/property_integer_reference.hpp → ...therEditor/property_integer_reference.hpp
diff --git a/src/editor/property_integer_values_value.cpp → ...rEditor/property_integer_values_value.cpp b/src/editor/property_integer_values_value.cpp → ...rEditor/property_integer_values_value.cpp
diff --git a/src/editor/property_integer_values_value.hpp → ...rEditor/property_integer_values_value.hpp b/src/editor/property_integer_values_value.hpp → ...rEditor/property_integer_values_value.hpp
diff --git a/...or/property_integer_values_value_base.hpp → ...or/property_integer_values_value_base.hpp b/...or/property_integer_values_value_base.hpp → ...or/property_integer_values_value_base.hpp
diff --git a/.../property_integer_values_value_getter.cpp → .../property_integer_values_value_getter.cpp b/.../property_integer_values_value_getter.cpp → .../property_integer_values_value_getter.cpp
diff --git a/.../property_integer_values_value_getter.hpp → .../property_integer_values_value_getter.hpp b/.../property_integer_values_value_getter.hpp → .../property_integer_values_value_getter.hpp
diff --git a/...operty_integer_values_value_reference.cpp → ...operty_integer_values_value_reference.cpp b/...operty_integer_values_value_reference.cpp → ...operty_integer_values_value_reference.cpp
diff --git a/...operty_integer_values_value_reference.hpp → ...operty_integer_values_value_reference.hpp b/...operty_integer_values_value_reference.hpp → ...operty_integer_values_value_reference.hpp
diff --git a/...integer_values_value_reference_getter.cpp → ...integer_values_value_reference_getter.cpp b/...integer_values_value_reference_getter.cpp → ...integer_values_value_reference_getter.cpp
diff --git a/...integer_values_value_reference_getter.hpp → ...integer_values_value_reference_getter.hpp b/...integer_values_value_reference_getter.hpp → ...integer_values_value_reference_getter.hpp
diff --git a/src/editor/property_property_container.cpp → ...herEditor/property_property_container.cpp b/src/editor/property_property_container.cpp → ...herEditor/property_property_container.cpp
diff --git a/src/editor/property_property_container.hpp → ...herEditor/property_property_container.hpp b/src/editor/property_property_container.hpp → ...herEditor/property_property_container.hpp
diff --git a/src/editor/property_string.cpp → ...itors/xrWeatherEditor/property_string.cpp b/src/editor/property_string.cpp → ...itors/xrWeatherEditor/property_string.cpp
diff --git a/src/editor/property_string.hpp → ...itors/xrWeatherEditor/property_string.hpp b/src/editor/property_string.hpp → ...itors/xrWeatherEditor/property_string.hpp
diff --git a/src/editor/property_string_shared_str.cpp → ...therEditor/property_string_shared_str.cpp b/src/editor/property_string_shared_str.cpp → ...therEditor/property_string_shared_str.cpp
diff --git a/src/editor/property_string_shared_str.hpp → ...therEditor/property_string_shared_str.hpp b/src/editor/property_string_shared_str.hpp → ...therEditor/property_string_shared_str.hpp
diff --git a/src/editor/property_string_values_value.cpp → ...erEditor/property_string_values_value.cpp b/src/editor/property_string_values_value.cpp → ...erEditor/property_string_values_value.cpp
diff --git a/src/editor/property_string_values_value.hpp → ...erEditor/property_string_values_value.hpp b/src/editor/property_string_values_value.hpp → ...erEditor/property_string_values_value.hpp
diff --git a/...tor/property_string_values_value_base.hpp → ...tor/property_string_values_value_base.hpp b/...tor/property_string_values_value_base.hpp → ...tor/property_string_values_value_base.hpp
diff --git a/...r/property_string_values_value_getter.cpp → ...r/property_string_values_value_getter.cpp b/...r/property_string_values_value_getter.cpp → ...r/property_string_values_value_getter.cpp
diff --git a/...r/property_string_values_value_getter.hpp → ...r/property_string_values_value_getter.hpp b/...r/property_string_values_value_getter.hpp → ...r/property_string_values_value_getter.hpp
diff --git a/...operty_string_values_value_shared_str.cpp → ...operty_string_values_value_shared_str.cpp b/...operty_string_values_value_shared_str.cpp → ...operty_string_values_value_shared_str.cpp
diff --git a/...operty_string_values_value_shared_str.hpp → ...operty_string_values_value_shared_str.hpp b/...operty_string_values_value_shared_str.hpp → ...operty_string_values_value_shared_str.hpp
diff --git a/...string_values_value_shared_str_getter.cpp → ...string_values_value_shared_str_getter.cpp b/...string_values_value_shared_str_getter.cpp → ...string_values_value_shared_str_getter.cpp
diff --git a/...string_values_value_shared_str_getter.hpp → ...string_values_value_shared_str_getter.hpp b/...string_values_value_shared_str_getter.hpp → ...string_values_value_shared_str_getter.hpp
diff --git a/src/editor/property_vec3f.cpp → ...ditors/xrWeatherEditor/property_vec3f.cpp b/src/editor/property_vec3f.cpp → ...ditors/xrWeatherEditor/property_vec3f.cpp
diff --git a/src/editor/property_vec3f.hpp → ...ditors/xrWeatherEditor/property_vec3f.hpp b/src/editor/property_vec3f.hpp → ...ditors/xrWeatherEditor/property_vec3f.hpp
diff --git a/src/editor/property_vec3f_base.cpp → ...s/xrWeatherEditor/property_vec3f_base.cpp b/src/editor/property_vec3f_base.cpp → ...s/xrWeatherEditor/property_vec3f_base.cpp
diff --git a/src/editor/property_vec3f_base.hpp → ...s/xrWeatherEditor/property_vec3f_base.hpp b/src/editor/property_vec3f_base.hpp → ...s/xrWeatherEditor/property_vec3f_base.hpp
diff --git a/src/editor/property_vec3f_reference.cpp → ...eatherEditor/property_vec3f_reference.cpp b/src/editor/property_vec3f_reference.cpp → ...eatherEditor/property_vec3f_reference.cpp
diff --git a/src/editor/property_vec3f_reference.hpp → ...eatherEditor/property_vec3f_reference.hpp b/src/editor/property_vec3f_reference.hpp → ...eatherEditor/property_vec3f_reference.hpp
diff --git a/src/editor/resource.h → src/editors/xrWeatherEditor/resource.h b/src/editor/resource.h → src/editors/xrWeatherEditor/resource.h
diff --git a/src/editor/window_ambients.resx → ...tors/xrWeatherEditor/window_ambients.resx b/src/editor/window_ambients.resx → ...tors/xrWeatherEditor/window_ambients.resx
diff --git a/src/editor/window_effects.resx → ...itors/xrWeatherEditor/window_effects.resx b/src/editor/window_effects.resx → ...itors/xrWeatherEditor/window_effects.resx
diff --git a/src/editor/window_flares.resx → ...ditors/xrWeatherEditor/window_flares.resx b/src/editor/window_flares.resx → ...ditors/xrWeatherEditor/window_flares.resx
diff --git a/src/editor/window_ide.cpp → src/editors/xrWeatherEditor/window_ide.cpp b/src/editor/window_ide.cpp → src/editors/xrWeatherEditor/window_ide.cpp
diff --git a/src/editor/window_ide.h → src/editors/xrWeatherEditor/window_ide.h b/src/editor/window_ide.h → src/editors/xrWeatherEditor/window_ide.h
diff --git a/src/editor/window_ide.resx → src/editors/xrWeatherEditor/window_ide.resx b/src/editor/window_ide.resx → src/editors/xrWeatherEditor/window_ide.resx
diff --git a/src/editor/window_ide_serialize.cpp → .../xrWeatherEditor/window_ide_serialize.cpp b/src/editor/window_ide_serialize.cpp → .../xrWeatherEditor/window_ide_serialize.cpp
diff --git a/src/editor/window_levels.cpp → ...editors/xrWeatherEditor/window_levels.cpp b/src/editor/window_levels.cpp → ...editors/xrWeatherEditor/window_levels.cpp
diff --git a/src/editor/window_levels.h → src/editors/xrWeatherEditor/window_levels.h b/src/editor/window_levels.h → src/editors/xrWeatherEditor/window_levels.h
diff --git a/src/editor/window_levels.resx → ...ditors/xrWeatherEditor/window_levels.resx b/src/editor/window_levels.resx → ...ditors/xrWeatherEditor/window_levels.resx
diff --git a/src/editor/window_sound_channels.resx → ...rWeatherEditor/window_sound_channels.resx b/src/editor/window_sound_channels.resx → ...rWeatherEditor/window_sound_channels.resx
diff --git a/src/editor/window_suns.resx → src/editors/xrWeatherEditor/window_suns.resx b/src/editor/window_suns.resx → src/editors/xrWeatherEditor/window_suns.resx
diff --git a/...ditor/window_thunderbolt_collections.resx → ...ditor/window_thunderbolt_collections.resx b/...ditor/window_thunderbolt_collections.resx → ...ditor/window_thunderbolt_collections.resx
diff --git a/src/editor/window_thunderbolts.resx → .../xrWeatherEditor/window_thunderbolts.resx b/src/editor/window_thunderbolts.resx → .../xrWeatherEditor/window_thunderbolts.resx
diff --git a/src/editor/window_tree_values.cpp → ...rs/xrWeatherEditor/window_tree_values.cpp b/src/editor/window_tree_values.cpp → ...rs/xrWeatherEditor/window_tree_values.cpp
diff --git a/src/editor/window_tree_values.h → ...tors/xrWeatherEditor/window_tree_values.h b/src/editor/window_tree_values.h → ...tors/xrWeatherEditor/window_tree_values.h
diff --git a/src/editor/window_tree_values.resx → ...s/xrWeatherEditor/window_tree_values.resx b/src/editor/window_tree_values.resx → ...s/xrWeatherEditor/window_tree_values.resx
diff --git a/src/editor/window_view.cpp → src/editors/xrWeatherEditor/window_view.cpp b/src/editor/window_view.cpp → src/editors/xrWeatherEditor/window_view.cpp
diff --git a/src/editor/window_view.h → src/editors/xrWeatherEditor/window_view.h b/src/editor/window_view.h → src/editors/xrWeatherEditor/window_view.h
diff --git a/src/editor/window_view.resx → src/editors/xrWeatherEditor/window_view.resx b/src/editor/window_view.resx → src/editors/xrWeatherEditor/window_view.resx
diff --git a/src/editor/window_weather.cpp → ...ditors/xrWeatherEditor/window_weather.cpp b/src/editor/window_weather.cpp → ...ditors/xrWeatherEditor/window_weather.cpp
@@ -2,7 +2,7 @@
 
 #pragma unmanaged
 #include <windows.h>
-#include "../include/editor/engine.hpp"
+#include "include/editor/engine.hpp"
 #pragma managed
 
 #include "window_weather.h"

diff --git a/src/editor/window_weather.h → src/editors/xrWeatherEditor/window_weather.h b/src/editor/window_weather.h → src/editors/xrWeatherEditor/window_weather.h
diff --git a/src/editor/window_weather.resx → ...itors/xrWeatherEditor/window_weather.resx b/src/editor/window_weather.resx → ...itors/xrWeatherEditor/window_weather.resx
diff --git a/src/editor/window_weather_editor.cpp → ...xrWeatherEditor/window_weather_editor.cpp b/src/editor/window_weather_editor.cpp → ...xrWeatherEditor/window_weather_editor.cpp
diff --git a/src/editor/window_weather_editor.h → ...s/xrWeatherEditor/window_weather_editor.h b/src/editor/window_weather_editor.h → ...s/xrWeatherEditor/window_weather_editor.h
diff --git a/src/editor/window_weather_editor.resx → ...rWeatherEditor/window_weather_editor.resx b/src/editor/window_weather_editor.resx → ...rWeatherEditor/window_weather_editor.resx
diff --git a/src/editor/editor.rc → ...ditors/xrWeatherEditor/xrWeatherEditor.rc b/src/editor/editor.rc → ...ditors/xrWeatherEditor/xrWeatherEditor.rc
diff --git a/src/editor/editor.vcxproj → ...s/xrWeatherEditor/xrWeatherEditor.vcxproj b/src/editor/editor.vcxproj → ...s/xrWeatherEditor/xrWeatherEditor.vcxproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{492D3DFE-9068-4E7E-A008-7C2420A651C0}</ProjectGuid>
-    <RootNamespace>editor</RootNamespace>
+    <RootNamespace>xrWeatherEditor</RootNamespace>
     <Keyword>ManagedCProj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -57,7 +57,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
@@ -80,7 +80,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
@@ -312,7 +312,7 @@
     <None Include="images\color_picker.cur" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="editor.rc" />
+    <ResourceCompile Include="xrWeatherEditor.rc" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="window_ide.resx">

diff --git a/src/editor/editor.vcxproj.filters → ...herEditor/xrWeatherEditor.vcxproj.filters b/src/editor/editor.vcxproj.filters → ...herEditor/xrWeatherEditor.vcxproj.filters
@@ -750,7 +750,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="editor.rc">
+    <ResourceCompile Include="xrWeatherEditor.rc">
       <Filter>resources</Filter>
     </ResourceCompile>
   </ItemGroup>

diff --git a/src/engine.sln b/src/engine.sln
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "maya", "maya", "{68CB7CEC-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lw", "lw", "{AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "editor", "editor", "{2DDE8FE4-6490-4AC5-B020-7E6A203F6318}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ode", "3rd party\ode\contrib\msvc7\ode_default\default.vcxproj", "{1BF75FEB-87DD-486C-880B-227987D191C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL32", "3rd party\openal\OpenAL-Windows\Router\Router.vcxproj", "{566551F4-4EF1-4CB4-A131-F982E7606907}"
@@ -99,8 +97,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrAPI", "Layers\xrAPI\xrAPI
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrRender_R3", "Layers\xrRenderPC_R3\xrRender_R3.vcxproj", "{3F383D3C-FCD8-4170-990B-EB4833F09248}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor\editor.vcxproj", "{492D3DFE-9068-4E7E-A008-7C2420A651C0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrEngine", "xrEngine\xrEngine.vcxproj", "{2578C6D8-660D-48AE-9322-7422F8664F06}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luabind.beta7-devel.rc4", "3rd party\luabind\luabind.beta7-devel.rc4.vcxproj", "{CC52E0B3-CC35-4934-9302-035B748F3F2C}"
@@ -133,6 +129,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "editors", "editors", "{CB0C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xrSdkControls", "editors\xrSdkControls\xrSdkControls.csproj", "{E9DC16A3-D0FA-4924-AF6E-F6FDF3EA0661}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrWeatherEditor", "editors\xrWeatherEditor\xrWeatherEditor.vcxproj", "{492D3DFE-9068-4E7E-A008-7C2420A651C0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_Dedicated|Any CPU = Debug_Dedicated|Any CPU
@@ -1117,33 +1115,6 @@ Global
 		{3F383D3C-FCD8-4170-990B-EB4833F09248}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{3F383D3C-FCD8-4170-990B-EB4833F09248}.Release|Win32.ActiveCfg = Release|Win32
 		{3F383D3C-FCD8-4170-990B-EB4833F09248}.Release|Win32.Build.0 = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Any CPU.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Win32.Build.0 = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Any CPU.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Any CPU.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Mixed Platforms.Build.0 = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Win32.ActiveCfg = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Win32.Build.0 = Debug|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Any CPU.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Any CPU.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Win32.ActiveCfg = Release|Win32
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Win32.Build.0 = Release|Win32
 		{2578C6D8-660D-48AE-9322-7422F8664F06}.Debug_Dedicated|Any CPU.ActiveCfg = Debug_Dedicated|Win32
 		{2578C6D8-660D-48AE-9322-7422F8664F06}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug_Dedicated|Win32
 		{2578C6D8-660D-48AE-9322-7422F8664F06}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug_Dedicated|Win32
@@ -1567,6 +1538,36 @@ Global
 		{E9DC16A3-D0FA-4924-AF6E-F6FDF3EA0661}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E9DC16A3-D0FA-4924-AF6E-F6FDF3EA0661}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E9DC16A3-D0FA-4924-AF6E-F6FDF3EA0661}.Release|Win32.ActiveCfg = Release|Any CPU
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Any CPU.ActiveCfg = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Debug|Win32.Build.0 = Debug|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Any CPU.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Any CPU.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Mixed Platforms.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Win32.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Mixed|Win32.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Any CPU.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release_Dedicated|Win32.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Any CPU.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Win32.ActiveCfg = Release|Win32
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1597,7 +1598,6 @@ Global
 		{56AD8F54-F89E-4B5A-93F8-8A617BFD1160} = {901F5C6A-BA06-4727-B9BC-762891749A46}
 		{C928FBB1-EDD8-4198-90DC-170A54C2AD72} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
 		{84D91673-C1A1-47FF-9A75-4E73F31F4C63} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
 		{CC52E0B3-CC35-4934-9302-035B748F3F2C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{F6C4F74A-152C-4612-9E3B-D02346234855} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{EFB76D6F-0092-439C-A783-C0BE10BD17C9} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
@@ -1610,6 +1610,7 @@ Global
 		{880CD250-BA77-4DAF-A8D4-552F12DD3AE4} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{0EB257DC-5CFC-44B0-82C9-CE6B158BE473} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{E9DC16A3-D0FA-4924-AF6E-F6FDF3EA0661} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4}
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4}
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

diff --git a/src/xrEngine/Device_Initialize.cpp b/src/xrEngine/Device_Initialize.cpp
@@ -12,10 +12,10 @@ extern LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 #ifdef INGAME_EDITOR
 void CRenderDevice::initialize_editor()
 {
-    m_editor_module = LoadLibrary("editor.dll");
+    m_editor_module = LoadLibrary("xrWeatherEditor.dll");
     if (!m_editor_module)
     {
-        Msg("! cannot load library \"editor.dll\"");
+        Msg("! cannot load library \"xrWeatherEditor.dll\"");
         return;
     }