Merge pull request #74 from BastiaanOlij/update_3.2_20200602

Bringing the 3.2 branch in line with Godot 3.2

README.md

@@ -5,9 +5,22 @@
 
 > `NativeScript` uses GDNative to implement scripts backed by native code.
 
+-   [**Branches**](#branches)
 -   [**Getting Started**](#getting-started)
 -   [**FAQ**](#faq)
 
+## Branches
+
+We maintain branches on this repo that relate directly to the main builds of Godot.
+Make sure you use the correct branch for the version of Godot you are using!
+
+| Branch | Version of Godot |
+| --- | --- |
+| [master](https://github.com/GodotNativeTools/godot_headers) | Godot master  |
+| [3.2](https://github.com/GodotNativeTools/godot_headers/tree/3.2) | Godot 3.2.x  |
+| [3.1](https://github.com/GodotNativeTools/godot_headers/tree/3.1) | Godot 3.1.x  |
+| [3.0](https://github.com/GodotNativeTools/godot_headers/tree/3.0) | Godot 3.0.x  |
+
 ## Getting Started
 
 | **Build latest version of Godot** | [**GitHub**](https://github.com/godotengine/godot) | [**Docs**](https://godot.readthedocs.io/en/latest/development/compiling/index.html) |

gdnative/variant.h

@@ -37,7 +37,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#define GODOT_VARIANT_SIZE (16 + sizeof(void *))
+#define GODOT_VARIANT_SIZE (16 + sizeof(int64_t))
 
 #ifndef GODOT_CORE_API_GODOT_VARIANT_TYPE_DEFINED
 #define GODOT_CORE_API_GODOT_VARIANT_TYPE_DEFINED