Merge remote-tracking branch 'remotes/origin/master' into swarmmod

Fix flora showing as black when deferred rendering is disabled (when …

…effects/mem/vid settings are on lowest). Instead just don't render them at all.