mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-11-04 07:01:04 +01:00 
			
		
		
		
	Merge branch 'master' into viewport
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
// dear imgui, v1.67 WIP
 | 
			
		||||
// dear imgui, v1.67
 | 
			
		||||
// (demo code)
 | 
			
		||||
 | 
			
		||||
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base:
 | 
			
		||||
@@ -70,6 +70,10 @@ Index of this file:
 | 
			
		||||
#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"   // warning : cast to 'void *' from smaller integer type 'int'
 | 
			
		||||
#pragma clang diagnostic ignored "-Wformat-security"            // warning : warning: format string is not a string literal
 | 
			
		||||
#pragma clang diagnostic ignored "-Wexit-time-destructors"      // warning : declaration requires an exit-time destructor       // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals.
 | 
			
		||||
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"  // warning : zero as null pointer constant                  // some standard header variations use #define NULL 0
 | 
			
		||||
#if __has_warning("-Wdouble-promotion")
 | 
			
		||||
#pragma clang diagnostic ignored "-Wdouble-promotion"           // warning: implicit conversion from 'float' to 'double' when passing argument to function  // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
 | 
			
		||||
#endif
 | 
			
		||||
#if __has_warning("-Wreserved-id-macro")
 | 
			
		||||
#pragma clang diagnostic ignored "-Wreserved-id-macro"          // warning : macro name is a reserved identifier                //
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user