Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #9011 from karroffel/ptrcall-nightmare-fix

fixed PowerState enum cast
Rémi Verschelde 8 years ago
parent
bd26fa7bf2 6bda2876f1
commit
59322d4cc4
2 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 0 1
      core/method_ptrcall.h
  2. 2 0
      core/os/os.h

+ 0 - 1
core/method_ptrcall.h
View File 

@@ -115,7 +115,6 @@ MAKE_PTRARG(PoolVector2Array);
 
 MAKE_PTRARG(PoolVector3Array);
 
 MAKE_PTRARG(PoolVector3Array);
 
 MAKE_PTRARG(PoolColorArray);
 
 MAKE_PTRARG(PoolColorArray);
 
 MAKE_PTRARG(Variant);
 
 MAKE_PTRARG(Variant);
 
-MAKE_PTRARG(PowerState);
 
 
 
 //this is for Object
 
 //this is for Object

+ 2 - 0
core/os/os.h
View File 

@@ -413,4 +413,6 @@ public:
 
 	virtual ~OS();
 
 	virtual ~OS();
 
 };
 
 };
 
 
 
+VARIANT_ENUM_CAST(PowerState);
 
+
 
 #endif
 
 #endif