Merge branch 'master' into member_test

Author: devshgraphicsprogramming

.gitignore

@@ -13,8 +13,6 @@
 *.ilk
 *.pdb
 *_d.exe
-# CEGUI's downloaded dependencies on Windows
-3rdparty/CEGUI/cegui-deps-0.8.x-src.zip
 # usually where people build
 android_build/*
 build*/*
@@ -23,14 +21,10 @@ install/*
 # legacy temporary and output directories
 lib/*
 doctemp/*
-source/obj
-source/Irrlicht/libIrrlichtServer.a
 # stuff output by examples
 examples_tests/*
 examples_tests/tmp/*
 android-sample/bin/*
-.vs/*
-*/.vs/*
-__pycache__/*
-*/__pycache__/*
-*.pyc
+# shader debug sideeffects
+preprocessed.hlsl
+compiled.spv