Merge branch 'master' into blender2.8
[blender.git] / .gitignore
index 21a07b8c0401291cfbf65c35e6d5aa8f599a255e..977fd9c26271d996dc812882ee8f5ac314be3f37 100644 (file)
@@ -11,10 +11,6 @@ __pycache__/
 *.swo
 *#
 
-# conflicts
-*.orig
-*.rej
-
 # QtCreator
 CMakeLists.txt.user
 
@@ -26,6 +22,7 @@ Desktop.ini
 # commonly used paths in blender
 /blender.bin
 /user-config.py
+/BUILD_NOTES.txt
 
 # local patches
 /*.patch
@@ -36,3 +33,9 @@ Desktop.ini
 /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