Added geometry into smoke rendering passes
Resolved geometry merge conflict