Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943

[MIRROR] Fix mindswap forcibly enabling ambient occlusion

code/_onclick/hud/hud.dm

@@ -196,7 +196,9 @@
 				screenmob.client.screen -= infodisplay
 
 	for(var/thing in plane_masters)
-		screenmob.client.screen += plane_masters[thing]
+		var/obj/screen/plane_master/PM = plane_masters[thing]
+		PM.backdrop(screenmob)
+		screenmob.client.screen += PM
 
 	hud_version = display_hud_version
 	persistent_inventory_update(screenmob)

code/_onclick/hud/plane_master.dm

@@ -29,6 +29,7 @@
 	blend_mode = BLEND_OVERLAY
 
 /obj/screen/plane_master/game_world/backdrop(mob/mymob)
+	filters = list()
 	if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion)
 		filters += AMBIENT_OCCLUSION
 

code/modules/client/preferences.dm

@@ -1537,9 +1537,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					ambientocclusion = !ambientocclusion
 					if(parent && parent.screen && parent.screen.len)
 						var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
-						PM.filters -= AMBIENT_OCCLUSION
-						if(ambientocclusion)
-							PM.filters += AMBIENT_OCCLUSION
+						PM.backdrop(parent.mob)
 
 				if("save")
 					save_preferences()