diff options
author | Dalai Felinto <dalai@blender.org> | 2021-05-07 16:45:25 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2021-05-07 16:45:25 +0300 |
commit | b78a1c05a30886df4c38b00565d22500309b5383 (patch) | |
tree | 308aa003dff1f92b0f0e293224664c6a29a7a30c /source/blender | |
parent | c58bf31aeddddc2cfa8ce84e00bf48e7a2f7c7b9 (diff) | |
parent | d0c63a2abe60d95b899c7122a754fe82e2077da2 (diff) |
Merge remote-tracking branch 'origin/blender-v2.93-release'
Diffstat (limited to 'source/blender')
4 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 3d24cd6fab5..809d6010f10 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -394,9 +394,10 @@ static bool eevee_volume_object_grids_init(Object *ob, ListBase *gpu_grids, DRWS * - Grid exists and texture was loaded -> use texture. * - Grid exists but has zero size or failed to load -> use zero. * - Grid does not exist -> use default value. */ - GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture : - (volume_grid) ? e_data.dummy_zero : - eevee_volume_default_texture(gpu_grid->default_value); + GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture : + (volume_grid) ? + e_data.dummy_zero : + eevee_volume_default_texture(gpu_grid->default_value); DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex); diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index ddab613e170..0a99d1020f6 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -24,8 +24,8 @@ #include "MEM_guardedalloc.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -405,7 +405,7 @@ static char *track_markers_desc(bContext *UNUSED(C), wmOperatorType *UNUSED(op), { const bool backwards = RNA_boolean_get(ptr, "backwards"); const bool sequence = RNA_boolean_get(ptr, "sequence"); - + if (backwards && sequence) { return BLI_strdup(TIP_("Track the selected markers backward for the entire clip")); } diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 9c4aa5bf27d..370a1942d20 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1522,7 +1522,8 @@ static void *sequencer_OCIO_transform_ibuf(const bContext *C, ImBuf *ibuf, bool *r_glsl_used, eGPUTextureFormat *r_format, - eGPUDataFormat *r_data, void **r_buffer_cache_handle) + eGPUDataFormat *r_data, + void **r_buffer_cache_handle) { void *display_buffer; bool force_fallback = false; @@ -1682,7 +1683,8 @@ static void sequencer_draw_display_buffer(const bContext *C, data = GPU_DATA_UBYTE; } else { - display_buffer = sequencer_OCIO_transform_ibuf(C, ibuf, &glsl_used, &format, &data, &buffer_cache_handle); + display_buffer = sequencer_OCIO_transform_ibuf( + C, ibuf, &glsl_used, &format, &data, &buffer_cache_handle); } if (draw_backdrop) { diff --git a/source/blender/io/collada/Materials.cpp b/source/blender/io/collada/Materials.cpp index 2cc80de2ec1..194a9ea397e 100644 --- a/source/blender/io/collada/Materials.cpp +++ b/source/blender/io/collada/Materials.cpp @@ -105,7 +105,7 @@ bNodeTree *MaterialNode::prepare_material_nodetree() return ntree; } -void MaterialNode::update_material_nodetree() +void MaterialNode::update_material_nodetree() { ntreeUpdateTree(CTX_data_main(mContext), ntree); } |