CMake: Remove Cycles specific OpenSubdiv options

[blender.git] / .editorconfig

diff --git a/.editorconfig b/.editorconfig
index d0e94a11ed0ea3c82c38ba091ea05d1d2ae62eb2..34d3f1aec82add7c4a0f3929e10a2ec5cdfcb322 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,10 +1,11 @@
 # C/C++
-[*.{c,cc,h,hh,inl}]
+[*.{c,cc,h,hh,inl,glsl}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
+indent_style = tab
 indent_size = 4
+max_line_length = 120
 
 # CMake & Text
 [*.{cmake,txt}]
@@ -13,6 +14,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = tab
 indent_size = 4
+max_line_length = 120
 
 # Python
 [*.py]
@@ -21,6 +23,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+max_line_length = 120
 
 # Shell
 [*.sh]
@@ -29,3 +32,13 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = tab
 indent_size = 4
+max_line_length = 120
+
+# reStructuredText
+[*.rst]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 3
+max_line_length = 120