main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
13 changed files with 26 additions and 26 deletions
Showing only changes of commit b6b0bc4531 - Show all commits

View File

@ -41,7 +41,7 @@ static const char *FRAGMENT_SHADER =
"void main()\n" "void main()\n"
"{\n" "{\n"
" vec4 rgba = texture(image_texture, texCoord_interp);\n" " vec4 rgba = texture(image_texture, texCoord_interp);\n"
/* Harcoded Rec.709 gamma, should use OpenColorIO eventually. */ /* Hard-coded Rec.709 gamma, should use OpenColorIO eventually. */
" fragColor = pow(rgba, vec4(0.45, 0.45, 0.45, 1.0));\n" " fragColor = pow(rgba, vec4(0.45, 0.45, 0.45, 1.0));\n"
"}\n\0"; "}\n\0";

View File

@ -44,7 +44,7 @@ typedef struct CfraElem {
/* ************** F-Curve Modifiers *************** */ /* ************** F-Curve Modifiers *************** */
/** /**
* F-Curve Modifier Type-Info (fmi): * F-Curve Modifier Type-Info (`fmi`):
* This struct provides function pointers for runtime, so that functions can be * This struct provides function pointers for runtime, so that functions can be
* written more generally (with fewer/no special exceptions for various modifiers). * written more generally (with fewer/no special exceptions for various modifiers).
* *

View File

@ -256,8 +256,8 @@ struct NodeData {
MEM_delete(node_data); MEM_delete(node_data);
} }
}; };
/* -------------------------------------------------------------------- */
/* -------------------------------------------------------------------- */
/** \name Fix non-manifold edge bleeding. /** \name Fix non-manifold edge bleeding.
* \{ */ * \{ */

View File

@ -122,11 +122,11 @@ typedef struct PTCacheID {
/* flags defined in DNA_object_force_types.h */ /* flags defined in DNA_object_force_types.h */
unsigned int data_types, info_types; unsigned int data_types, info_types;
/* copies point data to cache data */ /* Copies point data to cache data. */
int (*write_point)(int index, void *calldata, void **data, int cfra); int (*write_point)(int index, void *calldata, void **data, int cfra);
/* copies cache cata to point data */ /* Copies cache data to point data. */
void (*read_point)(int index, void *calldata, void **data, float cfra, const float *old_data); void (*read_point)(int index, void *calldata, void **data, float cfra, const float *old_data);
/* interpolated between previously read point data and cache data */ /* Interpolated between previously read point data and cache data. */
void (*interpolate_point)(int index, void (*interpolate_point)(int index,
void *calldata, void *calldata,
void **data, void **data,

View File

@ -983,7 +983,7 @@ static float *gpencil_stroke_points_from_editcurve_fixed_resolu(bGPDcurve_point
bool is_cyclic, bool is_cyclic,
int *r_points_len) int *r_points_len)
{ {
/* One stride contains: x, y, z, pressure, strength, Vr, Vg, Vb, Vmix_factor */ /* One stride contains: `x, y, z, pressure, strength, Vr, Vg, Vb, Vmix_factor`. */
const uint stride = sizeof(float[9]); const uint stride = sizeof(float[9]);
const uint array_last = curve_point_array_len - 1; const uint array_last = curve_point_array_len - 1;
const uint resolu_stride = resolution * stride; const uint resolu_stride = resolution * stride;

View File

@ -607,7 +607,7 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl
GPU_framebuffer_bind(fbl->main_fb); GPU_framebuffer_bind(fbl->main_fb);
GPU_framebuffer_clear_color_depth_stencil(fbl->main_fb, clear_col, clear_depth, clear_stencil); GPU_framebuffer_clear_color_depth_stencil(fbl->main_fb, clear_col, clear_depth, clear_stencil);
/* Depth prepass */ /* Depth pre-pass. */
DRW_draw_pass(psl->depth_ps); DRW_draw_pass(psl->depth_ps);
/* Create minmax texture */ /* Create minmax texture */
EEVEE_create_minmax_buffer(vedata, dtxl->depth, -1); EEVEE_create_minmax_buffer(vedata, dtxl->depth, -1);

View File

@ -221,7 +221,7 @@ static void external_cache_populate(void *vedata, Object *ob)
} }
struct GPUBatch *geom = DRW_cache_object_surface_get(ob); struct GPUBatch *geom = DRW_cache_object_surface_get(ob);
if (geom) { if (geom) {
/* Depth Prepass */ /* Depth Pre-pass. */
DRW_shgroup_call(stl->g_data->depth_shgrp, geom, ob); DRW_shgroup_call(stl->g_data->depth_shgrp, geom, ob);
} }
} }

View File

@ -309,7 +309,7 @@ typedef struct GPENCIL_PrivateData {
float fade_3d_object_opacity; float fade_3d_object_opacity;
/* Mask opacity uniform. */ /* Mask opacity uniform. */
float mask_opacity; float mask_opacity;
/* Xray transparency in solid mode. */ /* X-ray transparency in solid mode. */
float xray_alpha; float xray_alpha;
/* Mask invert uniform. */ /* Mask invert uniform. */
int mask_invert; int mask_invert;

View File

@ -234,8 +234,8 @@ static ImBuf *get_oiio_ibuf(ImageInput *in, const ReadContext &ctx, char colorsp
} }
/** /**
* Returns an ImageInput for the precise `format` requested using the provided IOMemReader. * Returns an #ImageInput for the precise `format` requested using the provided #IOMemReader.
* If successful, the ImageInput will be opened and ready for operations. Null will be returned if * If successful, the #ImageInput will be opened and ready for operations. Null will be returned if
* the format was not found or if the open call fails. * the format was not found or if the open call fails.
*/ */
static unique_ptr<ImageInput> get_oiio_reader(const char *format, static unique_ptr<ImageInput> get_oiio_reader(const char *format,
@ -358,10 +358,10 @@ ImageSpec imb_create_write_spec(const WriteContext &ctx, int file_channels, Type
/* Populate the spec with all common attributes. /* Populate the spec with all common attributes.
* *
* Care must be taken with the metadata: * Care must be taken with the metadata:
* - It should be processed first, before the "Resolution" metadata below, to * - It should be processed first, before the "Resolution" metadata below, to
* ensure the proper values end up in the ImageSpec * ensure the proper values end up in the #ImageSpec
* - It needs to filter format-specific metadata that may no longer apply to * - It needs to filter format-specific metadata that may no longer apply to
* the current format being written (e.g. metadata for tiff being written to a png) * the current format being written (e.g. metadata for tiff being written to a `PNG`)
*/ */
if (ctx.ibuf->metadata) { if (ctx.ibuf->metadata) {

View File

@ -24,13 +24,13 @@ struct ReadContext {
const eImbFileType file_type; const eImbFileType file_type;
const int flags; const int flags;
/* Override the automatic color-role choice with the value specified here. */ /** Override the automatic color-role choice with the value specified here. */
int use_colorspace_role = -1; int use_colorspace_role = -1;
/* Allocate and use all ImBuf image planes even if the image has fewer. */ /** Allocate and use all #ImBuf image planes even if the image has fewer. */
bool use_all_planes = false; bool use_all_planes = false;
/* Use the colorspace provided in the image metadata when available. */ /** Use the `colorspace` provided in the image metadata when available. */
bool use_embedded_colorspace = false; bool use_embedded_colorspace = false;
}; };
@ -58,7 +58,7 @@ bool imb_oiio_check(const uchar *mem, size_t mem_size, const char *file_format);
* The primary method for reading data into an #ImBuf. * The primary method for reading data into an #ImBuf.
* *
* During the `IB_test` phase of loading, the `colorspace` parameter will be populated * During the `IB_test` phase of loading, the `colorspace` parameter will be populated
* with the appropriate colorspace name. * with the appropriate `colorspace` name.
* *
* Upon return, the `r_newspec` parameter will contain image format information * Upon return, the `r_newspec` parameter will contain image format information
* which can be inspected afterwards if necessary. * which can be inspected afterwards if necessary.
@ -91,7 +91,7 @@ WriteContext imb_create_write_context(const char *file_format,
bool prefer_float = true); bool prefer_float = true);
/** /**
* Returns an ImageSpec filled in with all common attributes associated with the #ImBuf * Returns an #ImageSpec filled in with all common attributes associated with the #ImBuf
* provided as part of the #WriteContext. * provided as part of the #WriteContext.
* *
* This includes optional metadata that has been attached to the #ImBuf and which should be * This includes optional metadata that has been attached to the #ImBuf and which should be

View File

@ -3468,8 +3468,8 @@ static Py_hash_t bpy_bm_hash(PyObject *self)
return _Py_HashPointer(((BPy_BMesh *)self)->bm); return _Py_HashPointer(((BPy_BMesh *)self)->bm);
} }
/* Type Docstrings /* Type Doc-strings
* =============== */ * ================ */
PyDoc_STRVAR(bpy_bmesh_doc, "The BMesh data structure\n"); PyDoc_STRVAR(bpy_bmesh_doc, "The BMesh data structure\n");
PyDoc_STRVAR(bpy_bmvert_doc, "The BMesh vertex type\n"); PyDoc_STRVAR(bpy_bmvert_doc, "The BMesh vertex type\n");
@ -3694,7 +3694,7 @@ void BPy_BM_init_types(void)
BPy_BMFaceSeq_Type.tp_iter = (getiterfunc)bpy_bmelemseq_iter; BPy_BMFaceSeq_Type.tp_iter = (getiterfunc)bpy_bmelemseq_iter;
BPy_BMLoopSeq_Type.tp_iter = NULL; /* no mapping */ BPy_BMLoopSeq_Type.tp_iter = NULL; /* no mapping */
/* only 1 iteratir so far */ /* Only 1 iterator so far. */
BPy_BMIter_Type.tp_iternext = (iternextfunc)bpy_bmiter_next; BPy_BMIter_Type.tp_iternext = (iternextfunc)bpy_bmiter_next;
BPy_BMIter_Type.tp_iter = PyObject_SelfIter; BPy_BMIter_Type.tp_iter = PyObject_SelfIter;

View File

@ -829,7 +829,7 @@ PyObject *BPY_app_translations_struct(void)
{ {
PyObject *ret; PyObject *ret;
/* Let's finalize our contexts structseq definition! */ /* Let's finalize our contexts `PyStructSequence` definition! */
{ {
BLT_i18n_contexts_descriptor *ctxt; BLT_i18n_contexts_descriptor *ctxt;
PyStructSequence_Field *desc; PyStructSequence_Field *desc;

View File

@ -803,7 +803,7 @@ static PyObject *C_BVHTree_FromPolygons(PyObject * /*cls*/, PyObject *args, PyOb
} }
*p_plink_prev = nullptr; *p_plink_prev = nullptr;
/* all ngon's are parsed, now tessellate */ /* All NGON's are parsed, now tessellate. */
pf_arena = BLI_memarena_new(BLI_POLYFILL_ARENA_SIZE, __func__); pf_arena = BLI_memarena_new(BLI_POLYFILL_ARENA_SIZE, __func__);
tris = static_cast<uint(*)[3]>(MEM_mallocN(sizeof(*tris) * size_t(tris_len), __func__)); tris = static_cast<uint(*)[3]>(MEM_mallocN(sizeof(*tris) * size_t(tris_len), __func__));