Fix T48550: Imperfections when Bake displacement map to plane if camera is not in...
[blender.git] / .gitignore
index 21a07b8c0401291cfbf65c35e6d5aa8f599a255e..7acac981ed774da81ac3ecfc2b64d0bfbefaffa2 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