Moved BitMap to core.

core/SCsub

@@ -200,6 +200,7 @@ SConscript("log/SCsub")
 SConscript("object/SCsub")
 SConscript("input/SCsub")
 SConscript("bind/SCsub")
+SConscript("scene/SCsub")
 
 # Build it all as a library
 lib = env.add_library("core", env.core_sources)

core/scene/SCsub

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env.add_source_files(env.core_sources, "resources/*.cpp")
+#env.add_source_files(env.core_sources, "*.cpp")

editor/editor_atlas_packer.cpp

@@ -33,7 +33,7 @@
 #include "core/math/rect2.h"
 #include "core/typedefs.h"
 #include "core/string/ustring.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 
 void EditorAtlasPacker::_plot_triangle(Ref<BitMap> p_bitmap, Vector2i *vertices) {
 	int width = p_bitmap->get_size().width;

editor/editor_atlas_packer.h

@@ -32,7 +32,7 @@
 
 #include "core/math/vector2.h"
 #include "core/containers/vector.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "core/object/reference.h"
 
 class BitMap;

editor/import/resource_importer_bitmask.cpp

@@ -34,7 +34,7 @@
 #include "core/io/image_loader.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "scene/resources/texture.h"
 #include "core/io/image.h"
 

editor/plugins/bit_map_editor_plugin.h

@@ -33,7 +33,7 @@
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 
 #include "scene/gui/box_container.h"
 

editor/plugins/editor_preview_plugins.cpp

@@ -34,7 +34,7 @@
 #include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_scale.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "scene/resources/font/dynamic_font.h"
 #include "scene/resources/material/material.h"
 #include "scene/resources/mesh/mesh.h"

editor/plugins/sprite_editor_plugin.cpp

@@ -37,7 +37,7 @@
 #include "scene/2d/mesh_instance_2d.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/box_container.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "thirdparty/misc/clipper.hpp"
 #include "scene/resources/mesh/mesh.h"
 #include "core/variant/array.h"

modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp

@@ -6,7 +6,7 @@
 #include "core/io/resource_loader.h"
 #include "scene/resources/texture.h"
 
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 
 String ImagePickerButton::get_image_path() {
 	return image_path;

scene/2d/touch_screen_button.cpp

@@ -33,7 +33,7 @@
 #include "core/input/input_map.h"
 #include "core/input/input.h"
 #include "core/os/os.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
 #include "scene/resources/texture.h"
 #include "scene/main/scene_string_names.h"

scene/gui/texture_button.cpp

@@ -31,7 +31,7 @@
 #include "texture_button.h"
 
 #include "core/typedefs.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "scene/main/scene_string_names.h"
 
 #include <stdlib.h>

scene/register_scene_types.cpp

@@ -139,7 +139,7 @@
 #include "scene/main/viewport.h"
 #include "scene/main/world.h"
 #include "scene/audio/audio_stream_sample.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 #include "scene/resources/shapes/box_shape.h"
 #include "scene/resources/shapes/capsule_shape.h"
 #include "scene/resources/shapes_2d/capsule_shape_2d.h"

scene/resources/texture.cpp

@@ -36,7 +36,7 @@
 #include "core/object/method_bind_ext.gen.inc"
 #include "core/os/os.h"
 #include "scene/resources/mesh/mesh.h"
-#include "scene/resources/bit_map.h"
+#include "core/scene/resources/bit_map.h"
 
 Size2 Texture::get_size() const {
 	return Size2(get_width(), get_height());