Removed patches, as they are now built in into the engine.

SConstruct

@@ -520,44 +520,42 @@ if len(sys.argv) > 1:
             exit()
 
         exit()
-    elif arg[0] == 'p':
-        if arg == 'p':
-            print("Applies a patch. No Patches right now.Append s for the skeleton editor patch. For example: ps ")
-            exit()
-
-        cwd = os.getcwd()
-        full_path = cwd + '/engine/'
-
-        if not os.path.isdir(full_path):
-            print('engine directory does not exists.')
-            exit()
-
-        os.chdir(full_path)
-
-        #apply the patch to just the working directory, without creating a commit
-
-        if 's' in arg:
-            subprocess.call('git apply --index ../patches/custom_skeleton_3d_editor_plugin.patch', shell=True)
-
-            #unstage all files
-            subprocess.call('git reset', shell=True)
-
-            vman_full_path = cwd + '/engine/modules/voxelman/'
-
-            #also patch voxelman as the plugin changes forward_spatial_gui_input's definition
-            if os.path.isdir(vman_full_path):
-                os.chdir(vman_full_path)
-
-                subprocess.call('git apply --index ../../../patches/fix-voxel-editor-after-the-skeleton-editor-patch.patch', shell=True)
-
-                #unstage all files
-                subprocess.call('git reset', shell=True)
-            else:
-                print('Voxelman directory does not exists, skipping patch.')
-
-
-
-        exit()
+#    elif arg[0] == 'p':
+#        if arg == 'p':
+#            print("Applies a patch. No Patches right now.Append s for the skeleton editor patch. For example: ps ")
+#            exit()
+#
+#        cwd = os.getcwd()
+#        full_path = cwd + '/engine/'
+#
+#        if not os.path.isdir(full_path):
+#            print('engine directory does not exists.')
+#            exit()
+#
+#        os.chdir(full_path)
+#
+#        #apply the patch to just the working directory, without creating a commit
+#
+#        if 's' in arg:
+#            subprocess.call('git apply --index ../patches/custom_skeleton_3d_editor_plugin.patch', shell=True)
+#
+#            #unstage all files
+#            subprocess.call('git reset', shell=True)
+#
+#            vman_full_path = cwd + '/engine/modules/voxelman/'
+#
+#            #also patch voxelman as the plugin changes forward_spatial_gui_input's definition
+#            if os.path.isdir(vman_full_path):
+#                os.chdir(vman_full_path)
+#
+#                subprocess.call('git apply --index ../../../patches/fix-voxel-editor-after-the-skeleton-editor-patch.patch', shell=True)
+#
+#                #unstage all files
+#                subprocess.call('git reset', shell=True)
+#            else:
+#                print('Voxelman directory does not exists, skipping patch.')
+#
+#        exit()
 
 opts = Variables(args=ARGUMENTS)
 

patches/fix-voxel-editor-after-the-skeleton-editor-patch.patch

@@ -1,25 +0,0 @@
-From e99fc279858d939b833bdda85fd664ef4c335b09 Mon Sep 17 00:00:00 2001
-From: Relintai <relintai@protonmail.com>
-Date: Tue, 23 Feb 2021 10:14:50 +0100
-Subject: [PATCH] Fix voxel editor after the skeleton editor patch.
-
----
- world/voxel_world_editor.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/world/voxel_world_editor.h b/world/voxel_world_editor.h
-index 7195940..9ae9717 100644
---- a/world/voxel_world_editor.h
-+++ b/world/voxel_world_editor.h
-@@ -91,7 +91,7 @@ protected:
- 	void _notification(int p_what);
- 
- public:
--	virtual bool forward_spatial_gui_input(Camera *p_camera, const Ref<InputEvent> &p_event) { return voxel_world_editor->forward_spatial_input_event(p_camera, p_event); }
-+	virtual bool forward_spatial_gui_input(int p_index, Camera *p_camera, const Ref<InputEvent> &p_event) { return voxel_world_editor->forward_spatial_input_event(p_camera, p_event); }
- 	virtual String get_name() const { return "VoxelWorldEditor"; }
- 	bool has_main_screen() const { return false; }
- 	virtual void edit(Object *p_object);
--- 
-2.30.1
-