Merge branch 'master' of https://github.com/Ancurio/mkxp
This commit is contained in:
		
						commit
						085534ee72
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -121,7 +121,7 @@ struct SpritePrivate
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	void recomputeBushDepth()
 | 
						void recomputeBushDepth()
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		if (!bitmap)
 | 
							if (nullOrDisposed(bitmap))
 | 
				
			||||||
			return;
 | 
								return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		/* Calculate effective (normalized) bush depth */
 | 
							/* Calculate effective (normalized) bush depth */
 | 
				
			||||||
| 
						 | 
					@ -137,7 +137,7 @@ struct SpritePrivate
 | 
				
			||||||
		FloatRect rect = srcRect->toFloatRect();
 | 
							FloatRect rect = srcRect->toFloatRect();
 | 
				
			||||||
		Vec2i bmSize;
 | 
							Vec2i bmSize;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (bitmap)
 | 
							if (!nullOrDisposed(bitmap))
 | 
				
			||||||
			bmSize = Vec2i(bitmap->width(), bitmap->height());
 | 
								bmSize = Vec2i(bitmap->width(), bitmap->height());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (mirrored)
 | 
							if (mirrored)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue