Merge branch 'blender-v3.4-release'
This commit is contained in:
commit
baabac5909
|
@ -114,7 +114,7 @@ class CYCLES_OT_denoise_animation(Operator):
|
|||
|
||||
|
||||
class CYCLES_OT_merge_images(Operator):
|
||||
"Combine OpenEXR multilayer images rendered with different sample " \
|
||||
"Combine OpenEXR multi-layer images rendered with different sample " \
|
||||
"ranges into one image with reduced noise"
|
||||
bl_idname = "cycles.merge_images"
|
||||
bl_label = "Merge Images"
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
||||
/* Merge OpenEXR multilayer renders. */
|
||||
/* Merge OpenEXR multi-layer renders. */
|
||||
|
||||
class ImageMerger {
|
||||
public:
|
||||
|
|
|
@ -69,11 +69,11 @@ struct CurvePoint : public CurveSegment {
|
|||
/**
|
||||
* Cyclical index range. Allows iteration over a plain 'IndexRange' interval on form [start, end)
|
||||
* while also supporting treating the underlying array as a cyclic array where the last index is
|
||||
* followed by the first nidex in the 'cyclical' range. The cyclical index range can then be
|
||||
* followed by the first index in the 'cyclical' range. The cyclical index range can then be
|
||||
* considered a combination of the intervals separated by the last index of the underlying array,
|
||||
* namely [start, range_size) and [0, end) where start/end is the indices iterated between and
|
||||
* range_size is the size of the underlying array. To cycle the underlying array the interval
|
||||
* [0, range_size) can be iterated over an arbitrary amount of times inbetween.
|
||||
* [0, range_size) can be iterated over an arbitrary amount of times in between.
|
||||
*/
|
||||
class IndexRangeCyclic {
|
||||
/* Index to the start and end of the iterated range.
|
||||
|
|
|
@ -280,10 +280,9 @@ static void do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
|
|||
BLI_strncpy(filename, old_image->name, sizeof(filename));
|
||||
}
|
||||
|
||||
/* if z buffer is saved, change the image type to multilayer exr.
|
||||
* XXX this is slightly messy, Z buffer was ignored before for anything but EXR and IRIS ...
|
||||
* I'm just assuming here that IRIZ means IRIS with z buffer ...
|
||||
*/
|
||||
/* If Z buffer is saved, change the image type to multi-layer EXR.
|
||||
* XXX: this is slightly messy, Z buffer was ignored before for anything but EXR and IRIS ...
|
||||
* I'm just assuming here that IRIZ means IRIS with z buffer. */
|
||||
if (old_data && ELEM(old_data->im_format.imtype, R_IMF_IMTYPE_IRIZ, R_IMF_IMTYPE_OPENEXR)) {
|
||||
char sockpath[FILE_MAX];
|
||||
|
||||
|
@ -393,9 +392,8 @@ static void do_versions_nodetree_file_output_layers_2_64_5(bNodeTree *ntree)
|
|||
for (sock = node->inputs.first; sock; sock = sock->next) {
|
||||
NodeImageMultiFileSocket *input = sock->storage;
|
||||
|
||||
/* multilayer names are stored as separate strings now,
|
||||
* used the path string before, so copy it over.
|
||||
*/
|
||||
/* Multi-layer names are stored as separate strings now,
|
||||
* used the path string before, so copy it over. */
|
||||
BLI_strncpy(input->layer, input->path, sizeof(input->layer));
|
||||
|
||||
/* paths/layer names also have to be unique now, initial check */
|
||||
|
|
|
@ -65,7 +65,7 @@ void OutputFileNode::convert_to_operations(NodeConverter &converter,
|
|||
|
||||
if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) {
|
||||
const bool use_half_float = (storage->format.depth == R_IMF_CHAN_DEPTH_16);
|
||||
/* single output operation for the multilayer file */
|
||||
/* Single output operation for the multi-layer file. */
|
||||
OutputOpenExrMultiLayerOperation *output_operation;
|
||||
|
||||
if (is_multiview && storage->format.views_format == R_IMF_VIEWS_MULTIVIEW) {
|
||||
|
|
|
@ -31,7 +31,7 @@ class OutputOpenExrSingleLayerMultiViewOperation : public OutputSingleLayerOpera
|
|||
void deinit_execution() override;
|
||||
};
|
||||
|
||||
/* Writes inputs into OpenEXR multilayer channels. */
|
||||
/** Writes inputs into OpenEXR multi-layer channels. */
|
||||
class OutputOpenExrMultiLayerMultiViewOperation : public OutputOpenExrMultiLayerOperation {
|
||||
private:
|
||||
public:
|
||||
|
|
|
@ -71,7 +71,7 @@ struct OutputOpenExrLayer {
|
|||
SocketReader *image_input;
|
||||
};
|
||||
|
||||
/* Writes inputs into OpenEXR multilayer channels. */
|
||||
/* Writes inputs into OpenEXR multi-layer channels. */
|
||||
class OutputOpenExrMultiLayerOperation : public MultiThreadedOperation {
|
||||
protected:
|
||||
const Scene *scene_;
|
||||
|
|
|
@ -3487,10 +3487,10 @@ static int text_insert_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
|||
/* NOTE: the "text" property is always set from key-map,
|
||||
* so we can't use #RNA_struct_property_is_set, check the length instead. */
|
||||
if (!RNA_string_length(op->ptr, "text")) {
|
||||
/* if alt/ctrl/super are pressed pass through except for utf8 character event
|
||||
/* If Alt/Control/Super are pressed pass through except for utf8 character event
|
||||
* (when input method are used for utf8 inputs, the user may assign key event
|
||||
* including alt/ctrl/super like ctrl+m to commit utf8 string. in such case,
|
||||
* the modifiers in the utf8 character event make no sense.) */
|
||||
* including Alt/Control/Super like Control-M to commit utf8 string.
|
||||
* In such case, the modifiers in the utf8 character event make no sense). */
|
||||
if ((event->modifier & (KM_CTRL | KM_OSKEY)) && !event->utf8_buf[0]) {
|
||||
return OPERATOR_PASS_THROUGH;
|
||||
}
|
||||
|
|
|
@ -895,7 +895,7 @@ bke::CurvesGeometry trim_curves(const bke::CurvesGeometry &src_curves,
|
|||
}
|
||||
}
|
||||
|
||||
/* Compute destiation curves. */
|
||||
/* Compute destination curves. */
|
||||
compute_curve_trim_parameters(src_curves,
|
||||
selection,
|
||||
starts,
|
||||
|
|
|
@ -125,7 +125,7 @@ struct BufInfo {
|
|||
|
||||
static void opj_read_from_buffer_free(void *UNUSED(p_user_data))
|
||||
{
|
||||
/* nop */
|
||||
/* NOP. */
|
||||
}
|
||||
|
||||
static OPJ_SIZE_T opj_read_from_buffer(void *p_buffer, OPJ_SIZE_T p_nb_bytes, void *p_user_data)
|
||||
|
|
|
@ -811,7 +811,7 @@ static void imb_exr_get_views(MultiPartInputFile &file, StringVector &views)
|
|||
}
|
||||
}
|
||||
|
||||
/* Multilayer Blender files have the view name in all the passes (even the default view one) */
|
||||
/* Multi-layer Blender files have the view name in all the passes (even the default view one). */
|
||||
static void imb_exr_insert_view_name(char *name_full, const char *passname, const char *viewname)
|
||||
{
|
||||
BLI_assert(!ELEM(name_full, passname, viewname));
|
||||
|
|
Loading…
Reference in New Issue