Cleanup: spelling in comments, white-space in comments

This commit is contained in:
Campbell Barton
2023-10-19 18:53:16 +11:00
parent 4a813ba5af
commit e7e4e63313
56 changed files with 90 additions and 87 deletions
@@ -129,7 +129,7 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf,
/* Do first point. */
const bGPDspoint &first_pt = stroke_points.first();
stroke_positions.first() = float3(first_pt.x, first_pt.y, first_pt.z);
/* Previously, Grease Pencil used a radius convention where 1 "px" = 0.001 units. This "px" was
/* Previously, Grease Pencil used a radius convention where 1 `px` = 0.001 units. This `px` was
* the brush size which would be stored in the stroke thickness and then scaled by the point
* pressure factor. Finally, the render engine would divide this thickness value by 2000 (we're
* going from a thickness to a radius, hence the factor of two) to convert back into blender
@@ -1062,7 +1062,7 @@ static void enable_geometry_nodes_is_modifier(Main &bmain)
static void versioning_grease_pencil_stroke_radii_scaling(GreasePencil *grease_pencil)
{
using namespace blender;
/* Previously, Grease Pencil used a radius convention where 1 "px" = 0.001 units. This "px" was
/* Previously, Grease Pencil used a radius convention where 1 `px` = 0.001 units. This `px` was
* the brush size which would be stored in the stroke thickness and then scaled by the point
* pressure factor. Finally, the render engine would divide this thickness value by 2000 (we're
* going from a thickness to a radius, hence the factor of two) to convert back into blender
+4 -4
View File
@@ -262,16 +262,16 @@ struct Render;
* If this is the case the chunk will be added to the work-list for OpenCLDevice's
* otherwise the chunk will be added to the work-list of CPUDevices.
*
* A thread will read the work-list and sends a workpackage to its device.
* A thread will read the work-list and sends a work-package to its device.
*
* \see WorkScheduler.schedule method that is called to schedule a chunk
* \see Device.execute method called to execute a chunk
*
* \subsection CPUDevice CPUDevice
* When a CPUDevice gets a WorkPackage the Device will get the inputbuffer that is needed to
* When a CPUDevice gets a WorkPackage the Device will get the input-buffer that is needed to
* calculate the chunk. Allocation is already done by the ExecutionGroup.
* The outputbuffer of the chunk is being created.
* The OutputOperation of the ExecutionGroup is called to execute the area of the outputbuffer.
* The output-buffer of the chunk is being created.
* The OutputOperation of the ExecutionGroup is called to execute the area of the output-buffer.
*
* \see ExecutionGroup
* \see NodeOperation.execute_region executes a single chunk of a NodeOperation
@@ -305,15 +305,15 @@ class ExecutionGroup {
void init_execution();
/**
* \brief get all inputbuffers needed to calculate an chunk
* \note all inputbuffers must be executed
* \brief get all input-buffers needed to calculate an chunk
* \note all input-buffers must be executed
* \param chunk_number: the chunk to be calculated
* \return `(MemoryBuffer **)` the input-buffers.
*/
MemoryBuffer **get_input_buffers_opencl(int chunk_number);
/**
* \brief allocate the outputbuffer of a chunk
* \brief allocate the output-buffer of a chunk
* \param chunk_number: the number of the chunk in the ExecutionGroup
* \param rect: the rect of that chunk
* \see determine_chunk_rect
@@ -470,7 +470,7 @@ class NodeOperation {
* \param rect: the rectangle of the chunk (location and size)
* \param chunk_number: the chunk_number to be calculated
* \param memory_buffers: all input MemoryBuffer's needed
* \param output_buffer: the outputbuffer to write to
* \param output_buffer: the output-buffer to write to
*/
virtual void execute_opencl_region(OpenCLDevice * /*device*/,
rcti * /*rect*/,
@@ -103,10 +103,10 @@ void WriteBufferOperation::execute_opencl_region(OpenCLDevice *device,
float *output_float_buffer = output_buffer->get_buffer();
cl_int error;
/*
* 1. create cl_mem from outputbuffer
* 2. call NodeOperation (input) executeOpenCLChunk(.....)
* 3. schedule read back from opencl to main device (outputbuffer)
* 4. schedule native callback
* 1. create cl_mem from output_buffer.
* 2. call NodeOperation (input) executeOpenCLChunk(...).
* 3. schedule read back from OPENCL to main device (output_buffer).
* 4. schedule native callback.
*
* NOTE: list of cl_mem will be filled by 2, and needs to be cleaned up by 4
*/
@@ -861,8 +861,8 @@ class Texture : NonCopyable {
}
/**
* Clear the texture to NaN for floats, or a to debug value for ints.
* (For debugging unitialized data issues)
* Clear the texture to NaN for floats, or a to debug value for integers.
* (For debugging uninitialized data issues)
*/
void debug_clear()
{
+1 -1
View File
@@ -682,7 +682,7 @@ void DrawMultiBuf::bind(RecordingState &state,
group.vertex_len = num_input_primitives *
GPU_shader_get_ssbo_vertex_fetch_num_verts_per_prim(group.gpu_shader);
/* Override base index to -1, as all SSBO calls are submitted as non-indexed, with the
* index buffer indirection handled within the implemnetation. This is to ensure
* index buffer indirection handled within the implementation. This is to ensure
* command generation can correctly assigns baseInstance in the non-indexed formatting. */
group.base_index = -1;
}
+1 -1
View File
@@ -177,7 +177,7 @@ static int add_driver_with_target(ReportList * /*reports*/,
if ((RNA_property_unit(dst_prop) == PROP_UNIT_ROTATION) &&
(RNA_property_unit(src_prop) != PROP_UNIT_ROTATION))
{
/* Rotation Destination: normal -> radians, so convert src to radians
/* Rotation Destination: normal -> radians, so convert src to radians
* (However, if both input and output is a rotation, don't apply such corrections)
*/
STRNCPY(driver->expression, "radians(var)");
@@ -684,7 +684,7 @@ void ease_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const float factor
const float exponent = 1 + fabs(factor) * 4;
for (int i = segment->start_index; i < segment->start_index + segment->length; i++) {
/* For easy calculation of the curve, the values are normalized. */
/* For easy calculation of the curve, the values are normalized. */
const float normalized_x = (fcu->bezt[i].vec[1][0] - left_x) / key_x_range;
float normalized_y = 0;
@@ -619,7 +619,7 @@ void ui_draw_but_WAVEFORM(ARegion * /*region*/,
int scissor[4];
float colors[3][3];
const float colorsycc[3][3] = {{1, 0, 1}, {1, 1, 0}, {0, 1, 1}};
/* colors pre multiplied by alpha for speed up */
/* Colors pre-multiplied by alpha for speed up. */
float colors_alpha[3][3], colorsycc_alpha[3][3];
float min, max;
@@ -740,7 +740,7 @@ static void ui_block_colorpicker(uiBlock *block,
}
UI_but_flag_disable(bt, UI_BUT_UNDO);
bt->hardmax = hardmax; /* not common but rgb may be over 1.0 */
bt->hardmax = hardmax; /* Not common but RGB may be over 1.0. */
UI_but_func_set(bt, ui_colorpicker_hsv_update_cb, bt, nullptr);
bt->custom_data = cpicker;
+1 -1
View File
@@ -385,7 +385,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy)
* Ensure View2D rects remain in a viable configuration
* 'cur' is not allowed to be: larger than max, smaller than min, or outside of 'tot'
*/
/* XXX pre2.5 -> this used to be called test_view2d() */
/* XXX pre2.5 -> this used to be called #test_view2d() */
static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize)
{
float totwidth, totheight, curwidth, curheight, width, height;
@@ -196,7 +196,7 @@ static void draw_parallel_lines(const ParallelLinesSet *lines,
immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
immUniform2fv("viewportSize", &viewport[2]);
/* -1.0f offset here is because the line is too fat due to the builtin anti-aliasing.
/* -1.0f offset here is because the line is too fat due to the builtin anti-aliasing.
* TODO: make a variant or a uniform to toggle it off. */
immUniform1f("lineWidth", U.pixelsize - 1.0f);
}
@@ -262,7 +262,7 @@ static bool edbm_inset_calc(wmOperator *op)
EDBM_op_init(em,
&bmop,
op,
"inset_individual faces=%hf use_even_offset=%b use_relative_offset=%b "
"inset_individual faces=%hf use_even_offset=%b use_relative_offset=%b "
"use_interpolate=%b thickness=%f depth=%f",
BM_ELEM_SELECT,
use_even_offset,
@@ -4210,9 +4210,9 @@ static float bm_edge_seg_isect(const float sco_a[2],
y2max = max_ff(y21, y22) + 0.001f;
y2min = min_ff(y21, y22) - 0.001f;
/* Found an intersect, calc intersect point */
if (m1 == m2) { /* co-incident lines */
/* cut at 50% of overlap area */
/* Found an intersect, calc intersect point. */
if (m1 == m2) { /* Co-incident lines. */
/* Cut at 50% of overlap area. */
x1max = max_ff(x11, x12);
x1min = min_ff(x11, x12);
xi = (min_ff(x2max, x1max) + max_ff(x2min, x1min)) / 2.0f;
+2 -2
View File
@@ -3683,8 +3683,8 @@ static int object_convert_exec(bContext *C, wmOperator *op)
}
}
// XXX ED_object_editmode_enter(C, 0);
// XXX exit_editmode(C, EM_FREEDATA|); /* free data, but no undo */
// XXX: ED_object_editmode_enter(C, 0);
// XXX: exit_editmode(C, EM_FREEDATA|); /* free data, but no undo. */
if (basact) {
/* active base was changed */
@@ -218,7 +218,7 @@ struct SlideOperationExecutor {
self_->initial_positions_cu_ = curves_orig_->positions();
self_->initial_deformed_positions_cu_ = deformation.positions;
/* First find all curves to slide. When the mouse moves, only those curves will be moved. */
/* First find all curves to slide. When the mouse moves, only those curves will be moved. */
this->find_curves_to_slide_with_symmetry();
return;
}
@@ -829,10 +829,10 @@ static bool project_paint_PickColor(
/**
* Check if 'pt' is in front of the 3 verts on the Z axis (used for screen-space occlusion test)
* \return
* - `0`: no occlusion
* - `-1`: no occlusion but 2D intersection is true
* - `1`: occluded
* - `2`: occluded with `w[3]` weights set (need to know in some cases)
* - `0`: no occlusion.
* - `-1`: no occlusion but 2D intersection is true.
* - `1`: occluded.
* - `2`: occluded with `w[3]` weights set (need to know in some cases).
*/
static int project_paint_occlude_ptv(const float pt[3],
const float v1[4],
@@ -804,10 +804,9 @@ static Brush *brush_tool_cycle(Main *bmain, Paint *paint, Brush *brush_orig, con
}
}
else {
/* If user wants to switch to brush with the same tool as
/* If user wants to switch to brush with the same tool as
* currently active brush do a cycling via all possible
* brushes with requested tool.
*/
* brushes with requested tool. */
first_brush = brush_orig->id.next ? static_cast<Brush *>(brush_orig->id.next) :
static_cast<Brush *>(bmain->brushes.first);
}
@@ -791,7 +791,7 @@ void uiTemplateMovieclipInformation(uiLayout *layout,
* as metadata panel. So if the cache is skipped here it is not really a memory saver, but
* skipping the cache could lead to a performance impact depending on the order in which panels
* and the main area is drawn. Basically, if it is this template drawn first and then the main
* area it will lead to frame read and processing happening twice. */
* area it will lead to frame read and processing happening twice. */
ImBuf *ibuf = BKE_movieclip_get_ibuf_flag(clip, user, clip->flag, 0);
int width, height;
@@ -1297,7 +1297,7 @@ static int average_tracks_exec(bContext *C, wmOperator *op)
}
/* Create new empty track, which will be the averaged result.
* Makes it simple to average all selection to it. */
* Makes it simple to average all selection to it. */
MovieTrackingTrack *result_track = BKE_tracking_track_add_empty(tracking,
&tracking_object->tracks);
@@ -801,7 +801,7 @@ void uiTemplateImage(uiLayout *layout,
const float dpi_fac = UI_SCALE_FAC;
const int menus_width = 230 * dpi_fac;
/* use BKE_image_acquire_renderresult so we get the correct slot in the menu */
/* Use #BKE_image_acquire_renderresult so we get the correct slot in the menu. */
rr = BKE_image_acquire_renderresult(scene, ima);
uiblock_layer_pass_buttons(layout, ima, rr, iuser, menus_width, &ima->render_slot);
BKE_image_release_renderresult(scene, ima);
@@ -1186,7 +1186,7 @@ static void node_socket_outline_color_get(const bool selected,
}
else if (socket_type == SOCK_CUSTOM) {
/* Until there is a better place for per socket color,
* the outline color for virtual sockets is set here. */
* the outline color for virtual sockets is set here. */
copy_v4_v4(r_outline_color, virtual_node_socket_outline_color);
}
else {
@@ -2672,7 +2672,7 @@ static void node_draw_extra_info_panel_back(const bNode &node, const rctf &extra
{
const rctf &node_rect = node.runtime->totr;
rctf panel_back_rect = extra_info_rect;
/* Extend the panel behind hidden nodes to accomodate the large rounded corners. */
/* Extend the panel behind hidden nodes to accommodate the large rounded corners. */
if (node.flag & NODE_HIDDEN) {
panel_back_rect.ymin = BLI_rctf_cent_y(&node_rect);
}
@@ -96,7 +96,7 @@ struct SpaceNode_Runtime {
bool recalc_auto_compositing;
/**
* Indicates that the compositing int the space tree needs to be re-evaluated using
* Indicates that the compositing int the space tree needs to be re-evaluated using
* regular compositing pipeline.
*/
bool recalc_regular_compositing;
@@ -94,9 +94,10 @@ eV3DProjStatus ED_view3d_project_base(const ARegion *region, Base *base, float r
return ret;
}
/* perspmat is typically...
* - 'rv3d->perspmat', is_local == false
* - 'rv3d->persmatob', is_local == true
/**
* `perspmat` is typically either:
* - 'rv3d->perspmat', is_local == false.
* - 'rv3d->persmatob', is_local == true.
*/
static eV3DProjStatus ed_view3d_project__internal(const ARegion *region,
const float perspmat[4][4],
@@ -1958,7 +1958,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
*
* By definition transform-data has selected items in beginning,
* so only the first item in each container needs to be checked
* when looking for the presence of selected data. */
* when looking for the presence of selected data. */
if (t->flag & T_PROP_EDIT) {
bool has_selected_any = false;
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
@@ -676,7 +676,7 @@ struct TransInfo {
* \{ */
/**
* \note caller needs to free `t` on a 0 return
* \note Caller needs to free `t` on a 0 return.
* \warning \a event might be NULL (when tweaking from redo panel)
* \see #saveTransform which writes these values back.
*/
@@ -241,7 +241,7 @@ static BMLoop *get_next_loop(
BM_loop_calc_face_direction(l_tmp, tdir);
cross_v3_v3v3(vec_accum, l_tmp->f->no, tdir);
#if 0
/* rough guess, we can do better! */
/* Rough guess, we can do better! */
normalize_v3_length(vec_accum,
(BM_edge_calc_length(e_prev) + BM_edge_calc_length(e_next)) / 2.0f);
#else
@@ -607,7 +607,7 @@ static ParamHandle *construct_param_handle_subsurfed(const Scene *scene,
{
/* pointers to modifier data for unwrap control */
SubsurfModifierData *smd_real;
/* Modifier initialization data, will control what type of subdivision will happen. */
/* Modifier initialization data, will control what type of subdivision will happen. */
SubsurfModifierData smd = {{nullptr}};
/* Holds a map to edit-faces for every subdivision-surface face.
@@ -357,7 +357,7 @@ class Grid {
} while ((!visitor.stop()) && (nextRayCell(_current_cell, _current_cell)));
}
/** returns the cell next to the cell passed as argument. */
/** Returns the cell next to the cell passed as argument. */
bool nextRayCell(Vec3u &current_cell, Vec3u &next_cell);
uint _timestamp;
@@ -553,7 +553,7 @@ Vec2d CurvePoint::directionFredo() const
/* */
/**********************************/
/* for functions */
/* for functions */
Curve::~Curve()
{
@@ -692,19 +692,19 @@ class NonTVertex : public ViewVertex {
return _SVertex->getPoint3D();
}
/** Returns the projected 3D x coordinate of the vertex. */
/** Returns the projected 3D. Y coordinate of the vertex. */
virtual real getProjectedX() const
{
return _SVertex->point2D().x();
}
/** Returns the projected 3D y coordinate of the vertex. */
/** Returns the projected 3D. Y coordinate of the vertex. */
virtual real getProjectedY() const
{
return _SVertex->point2D().y();
}
/** Returns the projected 3D z coordinate of the vertex. */
/** Returns the projected 3D. Z coordinate of the vertex. */
virtual real getProjectedZ() const
{
return _SVertex->point2D().z();
+1 -1
View File
@@ -185,7 +185,7 @@ void GPU_context_main_unlock()
/** \} */
/* -------------------------------------------------------------------- */
/** \name GPU Begin/end work blocks
/** \name GPU Begin/end work blocks
*
* Used to explicitly define a per-frame block within which GPU work will happen.
* Used for global autoreleasepool flushing in Metal
@@ -35,7 +35,7 @@ using namespace metal;
/* `base_offset` refers to the base read offset in bytes of the input data buffer.
* Component offset adds an additional offset to read components. When clearing a buffer
* and only one source colour data element is provided, the base_offset is always zero.*/
* and only one source color data element is provided, the base_offset is always zero.*/
#if IS_TEXTURE_CLEAR == 1
# define READ_INPUT_DATA(base_offset, component_offset) (input_data[0 + component_offset])
#else
+2 -2
View File
@@ -1253,7 +1253,7 @@ bool MTLContext::ensure_buffer_bindings(
"[UBO] UBO (UBO Name: %s) bound at location: %d (buffer[[%d]]) with size "
"%lu (Expected size "
"%d) (Shader Name: %s) is too small -- binding NULL buffer. This is likely an "
"over-binding, which is not used, but we need this to avoid validation "
"over-binding, which is not used, but we need this to avoid validation "
"issues",
shader_interface->get_name_at_offset(ubo.name_offset),
ubo_location,
@@ -2683,7 +2683,7 @@ void present(MTLRenderPassDescriptor *blit_descriptor,
.count();
MTLContext::latency_resolve_average(microseconds_per_frame);
MTL_LOG_INFO("Frame Latency: %f ms (Rolling avg: %f ms Drawables: %d)",
MTL_LOG_INFO("Frame Latency: %f ms (Rolling avg: %f ms Drawables: %d)",
((float)microseconds_per_frame) / 1000.0f,
((float)MTLContext::avg_drawable_latency_us) / 1000.0f,
perf_max_drawables);
+3 -3
View File
@@ -1308,14 +1308,14 @@ void gpu::MTLTexture::clear(eGPUDataFormat data_format, const void *data)
/* Ensure texture is baked. */
this->ensure_baked();
/* If renderpass clear is not supported, use compute-based clear. */
/* If render-pass clear is not supported, use compute-based clear. */
bool do_render_pass_clear = true;
if (ELEM(type_, GPU_TEXTURE_1D, GPU_TEXTURE_1D_ARRAY)) {
do_render_pass_clear = false;
}
if (do_render_pass_clear) {
/* Create clear framebuffer for fast clear. */
/* Create clear frame-buffer for fast clear. */
GPUFrameBuffer *prev_fb = GPU_framebuffer_active_get();
FrameBuffer *fb = unwrap(this->get_blit_framebuffer(-1, 0));
fb->bind(true);
@@ -1894,7 +1894,7 @@ void gpu::MTLTexture::read_internal(int mip,
[enc insertDebugSignpost:@"GPUTextureReadCubeArray"];
}
/* NOTE: Depth should have a minimum vaue of 1 as we read at least one slice. */
/* NOTE: Depth should have a minimum value of 1 as we read at least one slice. */
int base_slice = z_off;
int final_slice = base_slice + depth;
size_t texture_array_relative_offset = 0;
+1 -1
View File
@@ -665,7 +665,7 @@ void gpu::MTLTexture::update_sub_depth_2d(
/** \} */
/* -------------------------------------------------------------------- */
/** \name Texture data read routines
/** \name Texture data read routines
* \{ */
id<MTLComputePipelineState> gpu::MTLTexture::mtl_texture_read_impl(
+1 -1
View File
@@ -69,7 +69,7 @@ class GLShader : public Shader {
void uniform_float(int location, int comp_len, int array_size, const float *data) override;
void uniform_int(int location, int comp_len, int array_size, const int *data) override;
/* Unusued: SSBO vertex fetch draw parameters. */
/* Unused: SSBO vertex fetch draw parameters. */
bool get_uses_ssbo_vertex_fetch() const override
{
return false;
+1 -1
View File
@@ -60,7 +60,7 @@ class VKShader : public Shader {
std::string geometry_layout_declare(const shader::ShaderCreateInfo &info) const override;
std::string compute_layout_declare(const shader::ShaderCreateInfo &info) const override;
/* Unusued: SSBO vertex fetch draw parameters. */
/* Unused: SSBO vertex fetch draw parameters. */
bool get_uses_ssbo_vertex_fetch() const override
{
return false;
+1 -1
View File
@@ -472,7 +472,7 @@ typedef struct Ipo {
#define IPO_SHORT_BIT 17
#define IPO_INT_BIT 18
/* icu->ipo: the type of curve */
/* icu->ipo: the type of curve. */
#define IPO_CONST 0
#define IPO_LIN 1
#define IPO_BEZ 2
+1 -1
View File
@@ -560,7 +560,7 @@ typedef enum eStringPropertySearchFlag {
* if search is supported.
*/
PROP_STRING_SEARCH_SUPPORTED = (1 << 0),
/** Items resulting from the search must be sorted. */
/** Items resulting from the search must be sorted. */
PROP_STRING_SEARCH_SORT = (1 << 1),
/**
* Allow members besides the ones listed to be entered.
+1 -1
View File
@@ -8065,7 +8065,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
prop = RNA_def_property(srna, "shadow_normal_bias", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.001f, 0.1f, 0.001, 3);
RNA_def_property_ui_text(prop, "Shadow Normal Bias", "Move along their normal");
RNA_def_property_ui_text(prop, "Shadow Normal Bias", "Move along their normal");
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr);
+1 -1
View File
@@ -5470,7 +5470,7 @@ static void rna_def_space_properties(BlenderRNA *brna)
prop, "Tab Search Results", "Whether or not each visible tab has a search result");
prop = RNA_def_property(srna, "search_filter", PROP_STRING, PROP_NONE);
/* The search filter is stored in the property editor's runtime which
/* The search filter is stored in the property editor's runtime which
* is only defined in an internal header, so use the getter / setter here. */
RNA_def_property_string_funcs(prop,
"rna_SpaceProperties_search_filter_get",
@@ -80,8 +80,10 @@ BLI_INLINE void copy_v3_v3_unmap(float a[3], const float b[3], const uint map[3]
a[map[2]] = b[2];
}
/* Clamps/Limits the given coordinate to: limits[0] <= co[axis] <= limits[1]
* The amount of clamp is saved on dcut */
/**
* Clamps/Limits the given coordinate to: limits[0] <= co[axis] <= limits[1]
* The amount of clamp is saved on `dcut`.
*/
static void axis_limit(const int axis, const float limits[2], float co[3], float dcut[3])
{
float val = co[axis];
+1 -1
View File
@@ -251,7 +251,7 @@ PyDoc_STRVAR(pygpu_shader_uniform_vector_float_doc,
"\n"
" :arg location: Location of the uniform variable to be modified.\n"
" :type location: int\n"
" :arg buffer: The data that should be set. Can support the buffer protocol.\n"
" :arg buffer: The data that should be set. Can support the buffer protocol.\n"
" :type buffer: sequence of floats\n"
" :arg length: Size of the uniform data type:\n\n"
" - 1: float\n"
@@ -153,7 +153,6 @@ if(WITH_PYTHON AND WITH_PYTHON_INSTALL AND WITH_INSTALL_PORTABLE AND (NOT WIN32)
find_python_module_file("certifi/cacert.pem" PYTHON_SSL_CERT_FILE _python_ssl_cert_file_relative)
mark_as_advanced(PYTHON_SSL_CERT_FILE)
if (PYTHON_SSL_CERT_FILE)
# This always moves up one level (even if there is a trailing slash).
add_definitions(-DPYTHON_SSL_CERT_FILE="${_python_ssl_cert_file_relative}")
else()
message(WARNING
@@ -672,7 +672,7 @@ PyDoc_STRVAR(
app_translations_locale_explode_doc,
".. method:: locale_explode(locale)\n"
"\n"
" Return all components and their combinations of the given ISO locale string.\n"
" Return all components and their combinations of the given ISO locale string.\n"
"\n"
" >>> bpy.app.translations.locale_explode(\"sr_RS@latin\")\n"
" (\"sr\", \"RS\", \"latin\", \"sr_RS\", \"sr@latin\")\n"
+2 -2
View File
@@ -6613,7 +6613,7 @@ static PyObject *pyrna_func_call(BPy_FunctionRNA *self, PyObject *args, PyObject
#ifdef DEBUG_STRING_FREE
# if 0
if (PyList_GET_SIZE(string_free_ls)) {
printf("%.200s.%.200s(): has %d strings\n",
printf("%.200s.%.200s(): has %d strings\n",
RNA_struct_identifier(self_ptr->type),
RNA_function_identifier(self_func),
int(PyList_GET_SIZE(string_free_ls)));
@@ -8710,7 +8710,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param
else if (ret_len == 1) {
err = pyrna_py_to_prop(&funcptr, pret_single, retdata_single, ret, "");
/* When calling operator functions only gives `Function.result` with no line number
/* When calling operator functions only gives `Function.result` with no line number
* since the function has finished calling on error, re-raise the exception with more
* information since it would be slow to create prefix on every call
* (when there are no errors). */
+1 -1
View File
@@ -442,7 +442,7 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id)
/* The render result uses shallow initialization, and the caller is not expected to
* explicitly free it. So simply assign the buffers as a shallow copy here as well.
*
* The thread safety is ensured via the re->resultmutex. */
* The thread safety is ensured via the `re->resultmutex`. */
rr->ibuf = rv->ibuf;
/* active layer */
@@ -713,13 +713,13 @@ static int ibuf_get_color_clip(float col[4], ImBuf *ibuf, int x, int y, int extf
} /* TXF alpha: clip = 1; } */
if (x >= ibuf->x) {
x = ibuf->x - 1;
} /* TXF alpha: clip = 1; } */
} /* TXF alpha: clip = 1; } */
if (y < 0) {
y = 0;
} /* TXF alpha: clip = 1; } */
} /* TXF alpha: clip = 1; } */
if (y >= ibuf->y) {
y = ibuf->y - 1;
} /* TXF alpha: clip = 1; } */
} /* TXF alpha: clip = 1; } */
}
}
@@ -145,7 +145,7 @@ class TextureMarginMap {
/* The map contains 2 kinds of pixels: DijkstraPixels and face indices. The top bit determines
* what kind it is. With the top bit set, it is a 'dijkstra' pixel. The bottom 4 bits encode the
* direction of the shortest path and the remaining 27 bits are used to store the distance. If
* the top bit is not set, the rest of the bits is used to store the face index.
* the top bit is not set, the rest of the bits is used to store the face index.
*/
#define PackDijkstraPixel(dist, dir) (0x80000000 + ((dist) << 4) + (dir))
#define DijkstraPixelGetDistance(dp) (((dp) ^ 0x80000000) >> 4)
@@ -199,9 +199,9 @@ static float tex_tri(float a)
static float wood_int(const Tex *tex, float x, float y, float z)
{
float wi = 0;
/* wave form: TEX_SIN=0, TEX_SAW=1, TEX_TRI=2 */
/* wave form: TEX_SIN=0, TEX_SAW=1, TEX_TRI=2. */
short wf = tex->noisebasis2;
/* wood type: TEX_BAND=0, TEX_RING=1, TEX_BANDNOISE=2, TEX_RINGNOISE=3 */
/* wood type: TEX_BAND=0, TEX_RING=1, TEX_BANDNOISE=2, TEX_RINGNOISE=3. */
short wt = tex->stype;
float (*waveform[3])(float); /* create array of pointers to waveform functions */
+2 -3
View File
@@ -580,10 +580,9 @@ void seq_prefetch_start(const SeqRenderData *context, float timeline_frame)
bool running = seq_prefetch_job_is_running(scene);
seq_prefetch_resume(scene);
/* conditions to start:
* prefetch enabled, prefetch not running, not scrubbing, not playing,
* prefetch enabled, prefetch not running, not scrubbing, not playing,
* cache storage enabled, has strips to render, not rendering, not doing modal transform -
* important, see D7820.
*/
* important, see D7820. */
if ((ed->cache_flag & SEQ_CACHE_PREFETCH_ENABLE) && !running && !scrubbing && !playing &&
ed->cache_flag & SEQ_CACHE_ALL_TYPES && has_strips && !G.is_rendering && !G.moving)
{
@@ -566,7 +566,7 @@ static void hair_get_boundbox(ClothModifierData *clmd, float gmin[3], float gmax
static void cloth_calc_force(
Scene *scene, ClothModifierData *clmd, float /*frame*/, ListBase *effectors, float time)
{
/* Collect forces and derivatives: F, dFdX, dFdV */
/* Collect forces and derivatives: F, dFdX, dFdV. */
Cloth *cloth = clmd->clothObject;
ClothSimSettings *parms = clmd->sim_parms;
Implicit_Data *data = cloth->implicit;
@@ -100,6 +100,8 @@ dict_custom = {
"defragmented",
"defragmenting",
"degeneracies",
"deinitialize",
"deinitializes",
"deletable",
"deleter",
"denoised",
@@ -165,6 +167,7 @@ dict_custom = {
"impactful",
"incrementation",
"inferencing",
"initializations",
"initializer",
"initializers",
"inlining",