[Bf-blender-cvs] [71aa3c864d2] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Wed Sep 2 02:21:06 CEST 2020
Commit: 71aa3c864d20fb577c7c2aa94e756fcd88aaa795
Author: Campbell Barton
Date: Wed Sep 2 09:58:26 2020 +1000
Branches: master
https://developer.blender.org/rB71aa3c864d20fb577c7c2aa94e756fcd88aaa795
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/scene.c
M source/blender/blenlib/intern/math_boolean.cc
M source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/gpu/GPU_framebuffer.h
M source/blender/gpu/intern/gpu_context_private.hh
M source/blender/gpu/intern/gpu_framebuffer.cc
M source/blender/gpu/intern/gpu_framebuffer_private.hh
M source/blender/gpu/opengl/gl_debug.cc
M source/blender/gpu/opengl/gl_framebuffer.cc
M source/blender/io/usd/tests/usd_stage_creation_test.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index e74fcbb84bd..3098aa79b88 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1501,8 +1501,7 @@ static void scene_graph_update_tagged(Depsgraph *depsgraph, Main *bmain, bool on
/* Flush editing data if needed. */
prepare_mesh_for_viewport_render(bmain, view_layer);
/* Update all objects: drivers, matrices, displists, etc. flags set
- * by depgraph or manual, no layer check here, gets correct flushed.
- */
+ * by depsgraph or manual, no layer check here, gets correct flushed. */
DEG_evaluate_on_refresh(depsgraph);
/* Update sound system. */
BKE_scene_update_sound(depsgraph, bmain);
diff --git a/source/blender/blenlib/intern/math_boolean.cc b/source/blender/blenlib/intern/math_boolean.cc
index 0c3b4ab8395..3755c4156e7 100644
--- a/source/blender/blenlib/intern/math_boolean.cc
+++ b/source/blender/blenlib/intern/math_boolean.cc
@@ -121,9 +121,9 @@ namespace robust_pred {
* and to export only the following declared non-static functions.
*
* Since this is C++, an instantiated singleton class is used to make
- * sure that exactinit() is called once.
- * (Because of undefinedness of when this is called in initialization of all
- * modules, other modules shouldn't use these functions in initialization.)
+ * sure that #exactinit() is called once.
+ * (Because it's undefined when this is called in initialization of all modules,
+ other modules shouldn't use these functions in initialization.)
*/
void exactinit();
diff --git a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
index 237905a1bf6..a8f05eedaaa 100644
--- a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
+++ b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
@@ -996,10 +996,10 @@ static void fill_grid_data(int x_subdiv,
static void spheregrid_test(int nrings, int grid_level, double z_offset, bool use_self)
{
- /* Make a uvsphere and a grid.
- * The sphere is radius 1, has nrings rings and 2 * nrings segs,
+ /* Make a uv-sphere and a grid.
+ * The sphere is radius 1, has `nrings` rings and `2 * nrings` segments,
* and is centered at (0,0,z_offset).
- * The plane is 4x4, has 2**grid_level subdivisions x and y,
+ * The plane is 4x4, has `2 ** grid_level` subdivisions x and y,
* and is centered at the origin. */
if (nrings < 2 || grid_level < 1) {
return;
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index cdc7ada8c84..6cfd33df7bf 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -293,7 +293,7 @@ static void draw_seq_waveform(View2D *v2d,
return;
}
- /* Fcurve lookup is quite expensive, so do this after precondition. */
+ /* F-curve lookup is quite expensive, so do this after precondition. */
FCurve *fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "volume", 0, NULL);
GPU_blend(GPU_BLEND_ALPHA);
@@ -586,9 +586,8 @@ static void draw_seq_outline(Sequence *seq,
immUniformColor3ubv(col);
/* 2px wide outline for selected strips. */
- /* XXX: some platforms don't support glLines wider than 1px (see T57570),
- * draw outline as four boxes instead.
- */
+ /* XXX: some platforms don't support OpenGL lines wider than 1px (see T57570),
+ * draw outline as four boxes instead. */
if (seq->flag & SELECT) {
/* Left */
immRectf(pos, x1 - pixelx, y1, x1 + pixelx, y2);
@@ -1232,8 +1231,9 @@ void ED_sequencer_special_preview_clear(void)
/**
* Rendering using opengl will change the current viewport/context.
- * This is why we need the ARegion, to set back the render area.
- * TODO do not rely on such hack and just update the ibuf ouside of
+ * This is why we need the \a region, to set back the render area.
+ *
+ * TODO: do not rely on such hack and just update the \a ibuf outside of
* the UI drawing code.
**/
ImBuf *sequencer_ibuf_get(struct Main *bmain,
@@ -1280,7 +1280,7 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain,
GPU_viewport_unbind(viewport);
}
else {
- /* Rendering can change OGL context. Save & Restore framebuffer. */
+ /* Rendering can change OGL context. Save & Restore frame-buffer. */
GPU_framebuffer_restore();
}
@@ -1364,7 +1364,7 @@ static void sequencer_draw_gpencil(const bContext *C)
/* Draw grease-pencil (image aligned). */
ED_annotation_draw_2dimage(C);
- /* Ortho at pixel level. */
+ /* Orthographic at pixel level. */
UI_view2d_view_restore(C);
/* Draw grease-pencil (screen aligned). */
@@ -1422,7 +1422,7 @@ static void sequencer_draw_borders(const SpaceSeq *sseq, const View2D *v2d, cons
#if 0
void sequencer_draw_maskedit(const bContext *C, Scene *scene, ARegion *region, SpaceSeq *sseq)
{
- /* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not.
+ /* NOTE: sequencer mask editing isn't finished, the draw code is working but editing not.
* For now just disable drawing since the strip frame will likely be offset. */
// if (sc->mode == SC_MODE_MASKEDIT)
@@ -1537,7 +1537,7 @@ static void sequencer_stop_running_jobs(const bContext *C, Scene *scene)
{
if (G.is_rendering == false && (scene->r.seq_prev_type) == OB_RENDER) {
/* Stop all running jobs, except screen one. Currently previews frustrate Render.
- * Need to make so sequencer's rendering doesn't conflict with compositor. */
+ * Need to make so sequencers rendering doesn't conflict with compositor. */
WM_jobs_kill_type(CTX_wm_manager(C), NULL, WM_JOB_TYPE_COMPOSITE);
/* In case of final rendering used for preview, kill all previews,
@@ -1607,7 +1607,7 @@ static void sequencer_draw_display_buffer(const bContext *C,
GPU_blend(GPU_BLEND_ALPHA);
}
- /* Format needs to be created prior to any immBindShader call.
+ /* Format needs to be created prior to any #immBindShader call.
* Do it here because OCIO binds it's own shader. */
eGPUTextureFormat format;
eGPUDataFormat data;
@@ -1787,7 +1787,7 @@ void sequencer_draw_preview(const bContext *C,
ibuf = sequencer_ibuf_get(
bmain, region, depsgraph, scene, sseq, cfra, frame_ofs, names[sseq->multiview_eye]);
- /* Setup offscreen buffers. */
+ /* Setup off-screen buffers. */
GPUViewport *viewport = WM_draw_region_get_viewport(region);
GPUFrameBuffer *framebuffer_overlay = GPU_viewport_framebuffer_overlay_get(viewport);
GPU_framebuffer_bind_no_srgb(framebuffer_overlay);
@@ -1837,7 +1837,7 @@ void sequencer_draw_preview(const bContext *C,
sequencer_draw_maskedit(C, scene, region, sseq);
#endif
- /* Scope is freed in sequencer_check_scopes when ibuf changes and redraw is needed. */
+ /* Scope is freed in sequencer_check_scopes when `ibuf` changes and redraw is needed. */
if (ibuf) {
IMB_freeImBuf(ibuf);
}
@@ -1902,7 +1902,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *region)
Sequence *seq;
/* Loop through strips, checking for those that are visible. */
for (seq = ed->seqbasep->first; seq; seq = seq->next) {
- /* Boundbox and selection tests for NOT drawing the strip. */
+ /* Bound-box and selection tests for NOT drawing the strip. */
if ((seq->flag & SELECT) != sel) {
continue;
}
@@ -1939,7 +1939,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *region)
if (BKE_sequence_effect_get_num_inputs(last_seq->type) > 0) {
draw_effect_inputs_highlight(last_seq);
}
- /* When active is a Multicam strip, highlight its source channel. */
+ /* When active is a Multi-cam strip, highlight its source channel. */
else if (last_seq->type == SEQ_TYPE_MULTICAM) {
int channel = last_seq->multicam_source;
if (channel != 0) {
@@ -2285,7 +2285,7 @@ void draw_timeline_seq(const bContext *C, ARegion *region)
}
UI_view2d_view_ortho(v2d);
- /* Get timeline boundbox, needed for the scrollers. */
+ /* Get timeline bound-box, needed for the scroll-bars. */
boundbox_seq(scene, &v2d->tot);
draw_seq_backdrop(v2d);
UI_view2d_constant_grid_draw(v2d, FPS);
diff --git a/source/blender/gpu/GPU_framebuffer.h b/source/blender/gpu/GPU_framebuffer.h
index e6648c69de7..9a81ce07d9a 100644
--- a/source/blender/gpu/GPU_framebuffer.h
+++ b/source/blender/gpu/GPU_framebuffer.h
@@ -211,7 +211,7 @@ void GPU_framebuffer_recursive_downsample(GPUFrameBuffer *fb,
void *userData);
/* GPU OffScreen
- * - wrapper around framebuffer and texture for simple offscreen drawing
+ * - wrapper around frame-buffer and texture for simple off-screen drawing
*/
GPUOffScreen *GPU_offscreen_create(
diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh
index b72eee13105..20e57c405ba 100644
--- a/source/blender/gpu/intern/gpu_context_private.hh
+++ b/source/blender/gpu/intern/gpu_context_private.hh
@@ -44,7 +44,7 @@ struct GPUMatrixState;
struct GPUContext {
public:
- /** State managment */
+ /** State management */
blender::gpu::Shader *shader = NULL;
blender::gpu::FrameBuffer *active_fb = NULL;
GPUMatrixState *matrix_state = NULL;
@@ -52,11 +52,11 @@ struct GPUContext {
blender::gpu::Immediate *imm = NULL;
/**
- * All 4 window framebuffers.
- * None of them are valid in an offscreen context.
- * Right framebuffers are only available if using stereo rendering.
- * Front framebuffers contains (in principle, but not always) the last frame color.
- * Default framebuffer is back_left.
+ * All 4 window frame-buffers.
+ * None of them are valid in an off-screen context.
+ * Right frame-buffers are only available if using stereo rendering.
+ * Front frame-buffers contains (in principle, but not always) the last frame color.
+ * Default frame-buffer is back_left.
*/
blender::gpu::FrameBuffer *back_left = NULL;
blender::gpu::FrameBuffer *front_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list