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:
authorCampbell Barton <ideasman42@gmail.com>2020-03-03 14:06:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-03 14:23:10 +0300
commitce2dc6ef2bce1fdd038989e0a7841600daccfd49 (patch)
tree17e83416a6fe99827941bff0dc5d7c3e510e6e0c /source/blender/draw
parent582205c13449e41cc876d6df951c354e897419ea (diff)
Cleanup: formatting, spelling
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/eevee/eevee_lightprobes.c6
-rw-r--r--source/blender/draw/engines/overlay/overlay_armature.c5
-rw-r--r--source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl2
-rw-r--r--source/blender/draw/engines/overlay/shaders/extra_vert.glsl6
-rw-r--r--source/blender/draw/intern/draw_manager_data.c2
-rw-r--r--source/blender/draw/intern/shaders/common_globals_lib.glsl2
6 files changed, 11 insertions, 12 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 5e6c11833d3..1f12ef1f379 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -789,10 +789,10 @@ void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
if (pinfo->do_grid_update) {
scene_orig->eevee.light_cache->flag |= LIGHTCACHE_UPDATE_GRID;
}
- /* If we update grid we need to update the cubemaps too.
- * So always refresh cubemaps. */
+ /* If we update grid we need to update the cube-maps too.
+ * So always refresh cube-maps. */
scene_orig->eevee.light_cache->flag |= LIGHTCACHE_UPDATE_CUBE;
- /* Tag the lightcache to auto update. */
+ /* Tag the light-cache to auto update. */
scene_orig->eevee.light_cache->flag |= LIGHTCACHE_UPDATE_AUTO;
/* Use a notifier to trigger the operator after drawing. */
WM_event_add_notifier(draw_ctx->evil_C, NC_LIGHTPROBE, scene_orig);
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 537698c7789..3bf91b0d0be 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -1284,9 +1284,8 @@ static void draw_axes(ArmatureDrawContext *ctx,
final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65;
if (pchan && pchan->custom && !(arm->flag & ARM_NO_CUSTOM)) {
- /** Special case: Custom bones can have different scale than the bone.
- * Recompute display matrix without the custom scalling applied. (T65640)
- **/
+ /* Special case: Custom bones can have different scale than the bone.
+ * Recompute display matrix without the custom scaling applied. (T65640). */
float axis_mat[4][4];
float length = pchan->bone->length;
copy_m4_m4(axis_mat, pchan->custom_tx ? pchan->custom_tx->pose_mat : pchan->pose_mat);
diff --git a/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl
index 738f0025f07..a82c13b9fb7 100644
--- a/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl
@@ -12,7 +12,7 @@ void main()
{
finalColor = colorLight;
- /* Relative to DPI scalling. Have constant screen size. */
+ /* Relative to DPI scaling. Have constant screen size. */
vec3 screen_pos = screenVecs[0].xyz * pos.x + screenVecs[1].xyz * pos.y;
vec3 p = inst_pos;
p.z *= (pos.z == 0.0) ? 0.0 : 1.0;
diff --git a/source/blender/draw/engines/overlay/shaders/extra_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_vert.glsl
index 92db27ea6dd..035fab1040e 100644
--- a/source/blender/draw/engines/overlay/shaders/extra_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/extra_vert.glsl
@@ -137,11 +137,11 @@ void main()
}
/* Empties */
else if ((vclass & VCLASS_EMPTY_SCALED) != 0) {
- /* This is a bit silly but we avoid scalling the object matrix on CPU (saving a mat4 mul) */
+ /* This is a bit silly but we avoid scaling the object matrix on CPU (saving a mat4 mul) */
vpos *= empty_scale;
}
else if ((vclass & VCLASS_EMPTY_SIZE) != 0) {
- /* This is a bit silly but we avoid scalling the object matrix on CPU (saving a mat4 mul) */
+ /* This is a bit silly but we avoid scaling the object matrix on CPU (saving a mat4 mul) */
vpos *= empty_size;
}
else if ((vclass & VCLASS_EMPTY_AXES) != 0) {
@@ -177,7 +177,7 @@ void main()
vec3 world_pos;
if ((vclass & VCLASS_SCREENSPACE) != 0) {
- /* Relative to DPI scalling. Have constant screen size. */
+ /* Relative to DPI scaling. Have constant screen size. */
vec3 screen_pos = screenVecs[0].xyz * vpos.x + screenVecs[1].xyz * vpos.y;
vec3 p = (obmat * vec4(vofs, 1.0)).xyz;
float screen_size = mul_project_m4_v3_zfac(p) * sizePixel;
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 43e8e2a4733..6f2a9cc056f 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -514,7 +514,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
ob_infos->ob_flag += (ob->base_flag & BASE_FROM_DUPLI) ? (1 << 2) : 0;
ob_infos->ob_flag += (ob->base_flag & BASE_FROM_SET) ? (1 << 3) : 0;
ob_infos->ob_flag += (ob == DST.draw_ctx.obact) ? (1 << 4) : 0;
- /* Negative scalling. */
+ /* Negative scaling. */
ob_infos->ob_flag *= (ob->transflag & OB_NEG_SCALE) ? -1.0f : 1.0f;
/* Object Color. */
copy_v4_v4(ob_infos->ob_color, ob->color);
diff --git a/source/blender/draw/intern/shaders/common_globals_lib.glsl b/source/blender/draw/intern/shaders/common_globals_lib.glsl
index 1777b5e23fc..6a3bf150095 100644
--- a/source/blender/draw/intern/shaders/common_globals_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_globals_lib.glsl
@@ -104,7 +104,7 @@ layout(std140) uniform globalsBlock
vec4 screenVecs[2];
vec4 sizeViewport; /* Inverted size in zw. */
- float sizePixel; /* This one is for dpi scalling */
+ float sizePixel; /* This one is for dpi scaling */
float pixelFac; /* To use with mul_project_m4_v3_zfac() */
float sizeObjectCenter;
float sizeLightCenter;