[Bf-blender-cvs] [1025b5b924c] master: Cleanup: make format
Jacques Lucke
noreply at git.blender.org
Fri Sep 11 11:28:35 CEST 2020
Commit: 1025b5b924ce7a25b4db9b63f43cd2bba55fbede
Author: Jacques Lucke
Date: Fri Sep 11 11:21:53 2020 +0200
Branches: master
https://developer.blender.org/rB1025b5b924ce7a25b4db9b63f43cd2bba55fbede
Cleanup: make format
===================================================================
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenlib/intern/path_util.c
M source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index d21fe5afa7e..fea9bbe9bb5 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -570,9 +570,9 @@ void CustomData_data_transfer(const struct MeshPairRemap *me_remap,
/* .blend file I/O */
void CustomData_blend_write_prepare(struct CustomData *data,
- struct CustomDataLayer **r_write_layers,
- struct CustomDataLayer *write_layers_buff,
- size_t write_layers_size);
+ struct CustomDataLayer **r_write_layers,
+ struct CustomDataLayer *write_layers_buff,
+ size_t write_layers_size);
void CustomData_blend_write(struct BlendWriter *writer,
struct CustomData *data,
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 18a6e8a3525..6328c887063 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1300,7 +1300,7 @@ void BLI_setenv_if_new(const char *env, const char *val)
/**
* Get an env var, result has to be used immediately.
*
-* On windows getenv gets its variables from a static copy of the environment variables taken at
+ * On windows getenv gets its variables from a static copy of the environment variables taken at
* process start-up, causing it to not pick up on environment variables created during runtime.
* This function uses an alternative method to get environment variables that does pick up on
* runtime environment variables.
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
index 3db6cc1d3c1..4661cf248e6 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_vert.glsl
@@ -21,7 +21,7 @@ void main()
bool is_select = (flag & VERT_UV_SELECT) != 0;
selectionFac = is_select ? 1.0 : 0.0;
- /* Move selected edges to the top
+ /* Move selected edges to the top
* Vertices are between 0.0 and 0.2, Edges between 0.2 and 0.4
* actual pixels are at 0.75, 1.0 is used for the background. */
float depth = is_select ? 0.25 : 0.35;
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 66d7685b3a6..794b516489a 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2971,10 +2971,10 @@ static void rna_def_space_outliner(BlenderRNA *brna)
"View Layer",
"Display collections and objects in the view layer"},
{SO_SEQUENCE,
- "SEQUENCE",
- ICON_SEQUENCE,
- "Video Sequencer",
- "Display data belonging to the Video Sequencer"},
+ "SEQUENCE",
+ ICON_SEQUENCE,
+ "Video Sequencer",
+ "Display data belonging to the Video Sequencer"},
{SO_LIBRARIES,
"LIBRARIES",
ICON_FILE_BLEND,
More information about the Bf-blender-cvs
mailing list