[Bf-blender-cvs] [38b1450848d] master: Cleanup: tabs to spaces

Campbell Barton noreply at git.blender.org
Tue Sep 8 01:27:33 CEST 2020


Commit: 38b1450848d89aae8b5888afdaf143b150ff3f1f
Author: Campbell Barton
Date:   Tue Sep 8 09:23:02 2020 +1000
Branches: master
https://developer.blender.org/rB38b1450848d89aae8b5888afdaf143b150ff3f1f

Cleanup: tabs to spaces

===================================================================

M	build_files/cmake/platform/platform_win32.cmake
M	source/blender/blenkernel/intern/unit.c

===================================================================

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 007f77a583f..64e4b276610 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -149,8 +149,8 @@ include(build_files/cmake/platform/platform_win32_bundle_crt.cmake)
 remove_cc_flag("/MDd" "/MD" "/Zi")
 
 if(WITH_WINDOWS_PDB)
-	set(PDB_INFO_OVERRIDE_FLAGS "/Z7")
-	set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+  set(PDB_INFO_OVERRIDE_FLAGS "/Z7")
+  set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
 endif()
 
 if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index babb4965b1e..f4a280581f3 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -80,7 +80,7 @@
 #define UN_SC_LB    0.45359237f
 #define UN_SC_OZ    0.028349523125f
 
-#define UN_SC_FAH	0.555555555555f
+#define UN_SC_FAH   0.555555555555f
 
 /* clang-format on */
 
@@ -334,15 +334,15 @@ static struct bUnitCollection buPowerCollection = {buPowerDef, 3, 0, UNIT_COLLEC
 /* Temperature */
 static struct bUnitDef buMetricTempDef[] = {
   {"kelvin",  "kelvin",  "K",  NULL, "Kelvin",  "KELVIN",  1.0f, 0.0,    B_UNIT_DEF_NONE}, /* Base unit. */
-	{"celsius", "celsius", "°C", "C",  "Celsius", "CELCIUS", 1.0f, 273.15, B_UNIT_DEF_NONE},
-	NULL_UNIT,
+  {"celsius", "celsius", "°C", "C",  "Celsius", "CELCIUS", 1.0f, 273.15, B_UNIT_DEF_NONE},
+  NULL_UNIT,
 };
 static struct bUnitCollection buMetricTempCollection = {buMetricTempDef, 0, 0, UNIT_COLLECTION_LENGTH(buMetricTempDef)};
 
 static struct bUnitDef buImperialTempDef[] = {
   {"kelvin",     "kelvin",     "K",  NULL, "Kelvin",     "KELVIN",     1.0f,      0.0,    B_UNIT_DEF_NONE}, /* Base unit. */
-	{"fahrenheit", "fahrenheit", "°F", "F",  "Fahrenheit", "FAHRENHEIT", UN_SC_FAH, 459.67, B_UNIT_DEF_NONE},
-	NULL_UNIT,
+  {"fahrenheit", "fahrenheit", "°F", "F",  "Fahrenheit", "FAHRENHEIT", UN_SC_FAH, 459.67, B_UNIT_DEF_NONE},
+  NULL_UNIT,
 };
 static struct bUnitCollection buImperialTempCollection = {
     buImperialTempDef, 1, 0, UNIT_COLLECTION_LENGTH(buImperialTempDef)};



More information about the Bf-blender-cvs mailing list