Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/draw_cache_extract.h2
-rw-r--r--source/blender/draw/intern/draw_cache_impl_displist.c2
-rw-r--r--source/blender/draw/intern/draw_common.h8
-rw-r--r--source/blender/draw/intern/draw_manager.h4
-rw-r--r--source/blender/draw/intern/draw_manager_data.c4
-rw-r--r--source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc2
6 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h
index 5fc6629e804..848253a7e43 100644
--- a/source/blender/draw/intern/draw_cache_extract.h
+++ b/source/blender/draw/intern/draw_cache_extract.h
@@ -81,7 +81,7 @@ typedef enum eMRDataType {
MR_DATA_POLY_NOR = 1 << 1,
MR_DATA_LOOP_NOR = 1 << 2,
MR_DATA_LOOPTRI = 1 << 3,
- /** Force loop normals calculation. */
+ /** Force loop normals calculation. */
MR_DATA_TAN_LOOP_NOR = 1 << 4,
MR_DATA_MAT_OFFSETS = 1 << 5,
} eMRDataType;
diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c
index b59c4db8383..1d4f411c94d 100644
--- a/source/blender/draw/intern/draw_cache_impl_displist.c
+++ b/source/blender/draw/intern/draw_cache_impl_displist.c
@@ -861,7 +861,7 @@ void DRW_displist_indexbuf_create_edges_adjacency_lines(struct ListBase *lb,
}
BLI_edgehashIterator_getKey(ehi, &v1, &v2);
uint v0 = (uint)abs(v_data) - 1;
- if (v_data < 0) { /* inv_opposite */
+ if (v_data < 0) { /* inv_opposite */
SWAP(uint, v1, v2);
}
GPU_indexbuf_add_line_adj_verts(&elb, v0, v1, v2, v0);
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 6e3a73a8314..7e6e1f03f8a 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -142,8 +142,8 @@ typedef struct GlobalsUboStorage {
float colorUVShadow[4];
/* NOTE! Put all color before UBO_LAST_COLOR */
- float screenVecs[2][4]; /* padded as vec4 */
- float sizeViewport[2], sizeViewportInv[2]; /* packed as vec4 in glsl */
+ float screenVecs[2][4]; /* Padded as vec4. */
+ float sizeViewport[2], sizeViewportInv[2]; /* Packed as vec4 in GLSL. */
/* Pack individual float at the end of the buffer to avoid alignment errors */
float sizePixel, pixelFac;
@@ -190,7 +190,7 @@ void DRW_hair_free(void);
/* draw_fluid.c */
-/* Fluid simulation. */
+/* Fluid simulation. */
void DRW_smoke_ensure(struct FluidModifierData *fmd, int highres);
void DRW_smoke_ensure_coba_field(struct FluidModifierData *fmd);
void DRW_smoke_ensure_velocity(struct FluidModifierData *fmd);
@@ -206,7 +206,7 @@ struct DRW_Global {
* Add needed theme colors / values to DRW_globals_update() and update UBO
* Not needed for constant color. */
GlobalsUboStorage block;
- /** Define "globalsBlock" uniform for 'block'. */
+ /** Define "globalsBlock" uniform for 'block'. */
struct GPUUniformBuf *block_ubo;
struct GPUTexture *ramp;
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index d4e22c83798..373b51a67e0 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -172,9 +172,9 @@ typedef struct DRWObjectInfos {
float orcotexfac[2][4];
float ob_color[4];
float ob_index;
- float pad; /* UNUSED*/
+ float pad; /*UNUSED*/
float ob_random;
- float ob_flag; /* sign is negative scaling, */
+ float ob_flag; /* Sign is negative scaling. */
} DRWObjectInfos;
BLI_STATIC_ASSERT_ALIGN(DRWObjectMatrix, 16)
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 56909969dd7..5eedca4507e 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -2117,8 +2117,8 @@ void DRW_pass_sort_shgroup_z(DRWPass *pass)
}
}
}
- /* To be sorted a shgroup needs to have at least one draw command. */
- /* FIXME(fclem) In some case, we can still have empty shading group to sort. However their
+ /* To be sorted a shgroup needs to have at least one draw command. */
+ /* FIXME(fclem): In some case, we can still have empty shading group to sort. However their
* final order is not well defined.
* (see T76730 & D7729). */
// BLI_assert(handle != 0);
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
index 35b60002c1f..43ad28c2618 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
@@ -153,7 +153,7 @@ static void extract_lines_adjacency_finish(const MeshRenderData *UNUSED(mr),
if (v_data != NO_EDGE) {
BLI_edgehashIterator_getKey(ehi, &v2, &v3);
l1 = (uint)abs(v_data) - 1;
- if (v_data < 0) { /* inv_opposite */
+ if (v_data < 0) { /* `inv_opposite`. */
SWAP(uint, v2, v3);
}
l2 = data->vert_to_loop[v2];