Merge branch 'development' into Atom/santorac/PortToMaterialPipeline · 11a3aaf808 - Gogs

Merge branch 'development' into Atom/santorac/PortToMaterialPipeline

Signed-off-by: gadams3 <[email protected]>

gadams3 2 years ago

parent

4775c181e3 31ac6ca3ad

commit

11a3aaf808

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
.gitignore
							 
								View File
							
				@@ -8,3 +8,4 @@ AssetProcessorTemp/**
			
				 [Cc]ache/
			
				 [Uu]ser/
			
				 .DS_Store
			
				+CMakeUserPresets.json