Merge branch 'master' into blender2.8

[blender.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e0228f27ceddd2ce96ff9d8aa8ec3d53eb2149f0..977fd9c26271d996dc812882ee8f5ac314be3f37 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@ __pycache__/
 *.swo
 *#
 
+# QtCreator
+CMakeLists.txt.user
+
 # ms-windows
 Thumbs.db
 ehthumbs.db
@@ -19,7 +22,20 @@ Desktop.ini
 # commonly used paths in blender
 /blender.bin
 /user-config.py
+/BUILD_NOTES.txt
 
 # local patches
 /*.patch
 /*.diff
+
+# in-source doc-gen
+/doc/doxygen/html/
+/doc/python_api/sphinx-in-tmp/
+/doc/python_api/sphinx-in/
+/doc/python_api/sphinx-out/
+/doc/python_api/rst/bmesh.ops.rst
+/doc/python_api/rst/in_menu.png
+/doc/python_api/rst/menu_id.png
+/doc/python_api/rst/op_prop.png
+/doc/python_api/rst/run_script.png
+/doc/python_api/rst/spacebar.png