ocornut 
							
						 
					 
					
						
						
							
						
						1ee252772a 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	docs/CHANGELOG.txt 
						
						
					 
					
						2022-02-07 18:20:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						c71a50deb5 
					 
					
						
						
							
							Version 1.87  
						
						 
						
						
						
						
					 
					
						2022-02-07 18:16:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						033538731c 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp 
						
						
					 
					
						2022-02-07 16:18:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						e52bb147a7 
					 
					
						
						
							
							Backends: GLFW: Added ImGui_ImplGlfw_InstallCallbacks()/ImGui_ImplGlfw_RestoreCallbacks(). ( #4981 )  
						
						 
						
						
						
						
					 
					
						2022-02-07 16:11:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						40fd163a3b 
					 
					
						
						
							
							Backends: OpenGL3: Fix OpenGL ES2 includes on Apple systems.  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt 
						
						
					 
					
						2022-02-07 12:26:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						2554b512c0 
					 
					
						
						
							
							Backends: OSX: Forward keyDown/keyUp events to OS when unused by Dear ImGui.  
						
						 
						
						
						
						
					 
					
						2022-02-07 11:55:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clownacy 
							
						 
					 
					
						
						
							
						
						c6cab1f352 
					 
					
						
						
							
							Backends: SDL: Added SDL_Renderer* parameter to ImGui_ImplSDL2_InitForSDLRenderer(). Use SDL_GetRendererOutputSize() instead of SDL_GL_GetDrawableSize() when bound to a SDL_Renderer. ( #4927 )  
						
						 
						
						... 
						
						
						
						This is (kind of) an OpenGL-only function, which should be avoided when SDL2 isn't using OpenGL.
The only alternative that is recommended is SDL_GetRendererOutputSize, which limits this fix to the SDL_Renderer backend. Still, I think it's better than nothing.
I say that SDL_GL_GetDrawableSize is "kind of" OpenGL-only because it does technically work even when SDL2 isn't using OpenGL.
It's just that it becomes a shim to SDL_GetWindowSize, which is not suitable for high-DPI usage because it reflects the size of the window in screen coordinates, not actual pixels, so it really should be avoided when not using OpenGL. 
						
						
					 
					
						2022-02-04 16:51:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clownacy 
							
						 
					 
					
						
						
							
						
						c39192ba64 
					 
					
						
						
							
							Backends: SDL_Renderer: Fix texture atlas format on big-endian hardware ( #4927 )  
						
						 
						
						... 
						
						
						
						SDL_PIXELFORMAT_RGBA32 is intended for byte arrays where the channels
are specifically in the RGBA order. However, this is not what
GetTexDataAsRGBA32 does: rather, it constructs an array where each
pixel is an unsigned int in ABGR order. On little-endian platforms,
this does indeed result in an RGBA byte order, however, on big-endian
platforms, this results in an ABGR byte order, which does not match
the PIXELFORMAT enum.
What should be used is the SDL_PIXELFORMAT_ABGR8888 enum, which
specifies that the pixels are in native-endian ABGR, which they are. 
						
						
					 
					
						2022-02-04 16:43:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						37958ca1b5 
					 
					
						
						
							
							Docking: Fixed CTRL+TAB back into a docked window not selecting menu layer when no item are on main layer.  
						
						 
						
						... 
						
						
						
						Could merge on master. 
						
						
					 
					
						2022-02-03 00:19:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						8eb8689391 
					 
					
						
						
							
							Docking: Tabs use their own identifier (in order to make window->ID refer to whole window in test engine).  Also prevents Tab ID from clashing with "" which was common.  
						
						 
						
						
						
						
					 
					
						2022-02-02 23:23:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						c1ab3c406f 
					 
					
						
						
							
							Docking: Fixed size constraints not working on single window holding on a dock id (still doesn't work on docked windows).  
						
						 
						
						
						
						
					 
					
						2022-02-02 23:10:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						d378e4088f 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp 
						
						
					 
					
						2022-02-01 15:46:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rokups 
							
						 
					 
					
						
						
							
						
						551ab84c2d 
					 
					
						
						
							
							Backends: OSX: Fix building with old Xcode versions.  
						
						 
						
						... 
						
						
						
						Builds have failed on Xcode versions that do not yet support `@available` or do not have new APIs (that are unavailable on target OS version) defined at all. Using true build time version checks fixes these issues. 
						
						
					 
					
						2022-01-31 14:41:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clownacy 
							
						 
					 
					
						
						
							
						
						422902dbda 
					 
					
						
						
							
							Correct typos ( #4954 ,  #4955 ), use IM_STATIC_ASSERT now that old pre-C++11 macro has been obsoleted.  
						
						 
						
						
						
						
					 
					
						2022-01-31 11:58:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						27004aca70 
					 
					
						
						
							
							Revert moving ImGuiKeyModFlags to internal.h (amendc906c65)  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	imgui.cpp 
						
						
					 
					
						2022-01-28 15:53:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						49e38a5b32 
					 
					
						
						
							
							Revert moving ImGuiKeyModFlags to internal.h (amendc906c65)  
						
						 
						
						
						
						
					 
					
						2022-01-28 15:53:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						d5f0d45ae4 
					 
					
						
						
							
							Merge branch 'master' into docking + remove two _PopUnusedDrawCmd() from docking branch, following  718daa1 
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h 
						
						
					 
					
						2022-01-27 17:50:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						c906c65cac 
					 
					
						
						
							
							(BREAKING) Replaced AddKeyModsEvent() added by  790132a in favor of unified key enum system. Backends: update most. ( #4921 ,  #4858 )  
						
						 
						
						... 
						
						
						
						Sorry this is an unusual breaking but since we are WIP it is a good time to make a correction. 
						
						
					 
					
						2022-01-27 17:46:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						075f4ac661 
					 
					
						
						
							
							Don't merge ImDrawCmd which have had their IdxOffset changed to not be sequential. Fixed CTRL+Tab into an empty window causing artefacts on the highlight rectangle due to bad reordering on ImDrawCmd.  
						
						 
						
						... 
						
						
						
						This is bit of a weird edge case adding weight to ImDrawCmd merging, if we could rework the mess in RenderDimmedBackgroundBehindWindow() we may be able to undo some of that. 
						
						
					 
					
						2022-01-26 15:53:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						f1a073186c 
					 
					
						
						
							
							Docking: Fixed a CTRL+TAB crash when aiming at an empty docked window. ( #4792 )  
						
						 
						
						
						
						
					 
					
						2022-01-25 17:28:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b17b2fb732 
					 
					
						
						
							
							Popups: Fixed an issue when reopening a same popup multiple times would offset them by 1 pixel on the right. ( #4936 )  
						
						 
						
						... 
						
						
						
						Passing explicit ImGuiPopupFlags_MouseButtonRight to OpenPopupOnItemClick() calls somehow document the unusual (due to legacy) default value. 
						
						
					 
					
						2022-01-24 13:24:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						cda3db1449 
					 
					
						
						
							
							Backends: SDL: Fixed key mapping for ImGuiKey_Menu ( #4921 ) + misc typos ( #4928 )  
						
						 
						
						
						
						
					 
					
						2022-01-24 12:19:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clownacy 
							
						 
					 
					
						
						
							
						
						4fb0c1f963 
					 
					
						
						
							
							Correct some typos in FAQ.md ( #4924 )  
						
						 
						
						
						
						
					 
					
						2022-01-22 00:03:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						c2db4c2462 
					 
					
						
						
							
							Demo: draw a section of keyboard in "Inputs > Keyboard, Gamepad & Navigation state" to visualize keys.  
						
						 
						
						
						
						
					 
					
						2022-01-21 15:25:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						69b697378b 
					 
					
						
						
							
							Comments, tweaks.  
						
						 
						
						
						
						
					 
					
						2022-01-21 14:50:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						26e59c8742 
					 
					
						
						
							
							Nav: Fixed gamepad navigation in wrapping popups not wrapping all the way. ( #4365 )  
						
						 
						
						
						
						
					 
					
						2022-01-21 14:41:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						3e0d6ec895 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h 
						
						
					 
					
						2022-01-21 12:39:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						5ea47d9560 
					 
					
						
						
							
							Backends: OSX: Add full gamepad support using io.AddKeyEvent(), io.AddKeyAnalogEvent(), stopped writing to io.NavInputs[]. ( #4858 ,  #787 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 17:25:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						39c3412f91 
					 
					
						
						
							
							Backends: SDL: Add full gamepad support using io.AddKeyEvent(), io.AddKeyAnalogEvent(), stopped writing to io.NavInputs[]. ( #4858 ,  #787 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 17:25:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						3d85433748 
					 
					
						
						
							
							Backends: GLFW: Add full gamepad support using io.AddKeyEvent(), io.AddKeyAnalogEvent(), stopped writing to io.NavInputs[]. ( #4858 ,  #787 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 17:25:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						9f8c599ca7 
					 
					
						
						
							
							Backends: Win32: Add full gamepad support using io.AddKeyEvent(), io.AddKeyAnalogEvent(), stopped writing to io.NavInputs[]. ( #4858 ,  #787 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 17:25:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						f33bb99821 
					 
					
						
						
							
							IO: added AddKeyAnalogEvent() and support for ImGuiKey_GamepadXXXX. ( #4858 ,  #787 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 17:24:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						ceb26bac48 
					 
					
						
						
							
							Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. ( #914 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 15:53:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rokas Kupstys 
							
						 
					 
					
						
						
							
						
						19471da3fd 
					 
					
						
						
							
							Popups: Fix a crash when a new window is created after a modal on the same frame. ( #4920 )  
						
						 
						
						
						
						
					 
					
						2022-01-20 15:03:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						7ad42ff431 
					 
					
						
						
							
							IO: renamed io.ConfigInputEventQueue to io.ConfigInputTrickleEventQueue. ( #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-19 18:45:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						26d04c948f 
					 
					
						
						
							
							Tables: Fixed positioning of Sort icon on right-most column with some settings (not resizable + no borders). ( #4918 ).  
						
						 
						
						
						
						
					 
					
						2022-01-19 18:03:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						91ae56af45 
					 
					
						
						
							
							Removed support for legacy arithmetic operators (+*/) when inputing text into a slider/drag. ( #4917 ,  #3184 )  
						
						 
						
						
						
						
					 
					
						2022-01-19 15:10:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						673f5e588d 
					 
					
						
						
							
							IO: moved fields to put more focus on the new functions + update misc docs/references + update main.mm in Apple+Metal example ( #4858 )  
						
						 
						
						
						
						
					 
					
						2022-01-18 17:41:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						e278277d53 
					 
					
						
						
							
							IO: added AddMouseViewportEvent() + used in backends.  
						
						 
						
						
						
						
					 
					
						2022-01-18 17:24:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						1338eb31f7 
					 
					
						
						
							
							Viewports: Relaxed specs for backend supporting ImGuiBackendFlags_HasMouseHoveredViewport. Backends: SDL: Added support for simplified HasMouseHoveredViewport. ( #1542 ,  #4665 )  
						
						 
						
						
						
						
					 
					
						2022-01-18 17:01:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						007a427e0a 
					 
					
						
						
							
							Viewports: Fixed active InputText() from preventing viewports to merge. ( #4212 )  
						
						 
						
						
						
						
					 
					
						2022-01-18 16:04:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						8567a4cca3 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui_demo.cpp
#	imgui_internal.h 
						
						
					 
					
						2022-01-17 18:19:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						7374b96f5c 
					 
					
						
						
							
							IO: Added input queue. ( #4858 ,  #2787 ,  #1992 ,  #3383 ,  #2525 ,  #1320 )  
						
						 
						
						
						
						
					 
					
						2022-01-17 17:36:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								thedmd 
							
						 
					 
					
						
						
							
						
						b8e56dce83 
					 
					
						
						
							
							IO: Added AddMousePosEvent(), AddMouseButtonEvent(), AddMouseWheelEvent() api + updated all Backends. ( #4858 ) (input queue code will be next commit)  
						
						 
						
						... 
						
						
						
						Details: note that SDL, OSX and GLFW backends removed recording of MouseJustPressed[] which will be unnecessary with input queue (which is the NEXT commit). (#2787 , #1992 , #3383 , #2525 , #1320 ) 
						
						
					 
					
						2022-01-17 17:35:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						b6582a471a 
					 
					
						
						
							
							Backends: OSX: Fix Game Controller nav mapping to use shoulder for both focusing and tweak speed. ( #4759 )  
						
						 
						
						
						
						
					 
					
						2022-01-17 16:22:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						0755767440 
					 
					
						
						
							
							Backends: move io.AddKeyModsEvent() next to io.AddKeyEvent() submission, rely on mods from platform/source. ( #4858 ) +  fix   #2622  again broken by  746c9f7 
						
						 
						
						... 
						
						
						
						Amended to submit modifiers before. 
						
						
					 
					
						2022-01-17 15:21:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						eb823655af 
					 
					
						
						
							
							Removed support for pre-C++11 compilers. We'll stop supporting VS2010. ( #4537 )  
						
						 
						
						... 
						
						
						
						Build all 
						
						
					 
					
						2022-01-17 11:54:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Adheesh Trivedi 
							
						 
					 
					
						
						
							
						
						f84c93d834 
					 
					
						
						
							
							Update BACKENDS.md ( #4909 )  
						
						 
						
						
						
						
					 
					
						2022-01-16 18:16:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						6188e94108 
					 
					
						
						
							
							Examples: Vulkan: fill Subpass and MSAASamples to increase discoverability ( #4886 ) + IO docs update ( #4858 )  
						
						 
						
						... 
						
						
						
						https://github.com/mosra/magnum-integration/pull/89  
						
						
					 
					
						2022-01-14 11:51:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ocornut 
							
						 
					 
					
						
						
							
						
						0647ba3bad 
					 
					
						
						
							
							Merge branch 'master' into docking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp 
						
						
					 
					
						2022-01-13 18:36:23 +01:00