archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: make format (clang-format)

Browse Source
This commit is contained in:
Dalai Felinto
2021-05-07 15:41:42 +02:00
parent 2bd85d9cc6
commit d0c63a2abe
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/engines/eevee/eevee_volumes.c
View File

@@ -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 and texture was loaded -> use texture.
* - Grid exists but has zero size or failed to load -> use zero. * - Grid exists but has zero size or failed to load -> use zero.
* - Grid does not exist -> use default value. */ * - Grid does not exist -> use default value. */
GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture : GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture :
(volume_grid) ? e_data.dummy_zero : (volume_grid) ?
eevee_volume_default_texture(gpu_grid->default_value); e_data.dummy_zero :
eevee_volume_default_texture(gpu_grid->default_value);
DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex); DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex);

4
source/blender/editors/space_clip/tracking_ops_track.c
View File

@@ -24,8 +24,8 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BLI_string.h" #include "BLI_string.h"
#include "BLI_utildefines.h"
#include "BLT_translation.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 backwards = RNA_boolean_get(ptr, "backwards");
const bool sequence = RNA_boolean_get(ptr, "sequence"); const bool sequence = RNA_boolean_get(ptr, "sequence");
if (backwards && sequence) { if (backwards && sequence) {
return BLI_strdup(TIP_("Track the selected markers backward for the entire clip")); return BLI_strdup(TIP_("Track the selected markers backward for the entire clip"));
} }

6
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@@ -1522,7 +1522,8 @@ static void *sequencer_OCIO_transform_ibuf(const bContext *C,
ImBuf *ibuf, ImBuf *ibuf,
bool *r_glsl_used, bool *r_glsl_used,
eGPUTextureFormat *r_format, eGPUTextureFormat *r_format,
eGPUDataFormat *r_data, void **r_buffer_cache_handle) eGPUDataFormat *r_data,
void **r_buffer_cache_handle)
{ {
void *display_buffer; void *display_buffer;
bool force_fallback = false; bool force_fallback = false;
@@ -1682,7 +1683,8 @@ static void sequencer_draw_display_buffer(const bContext *C,
data = GPU_DATA_UBYTE; data = GPU_DATA_UBYTE;
} }
else { 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) { if (draw_backdrop) {

2
source/blender/io/collada/Materials.cpp
View File

@@ -105,7 +105,7 @@ bNodeTree *MaterialNode::prepare_material_nodetree()
return ntree; return ntree;
} }
void MaterialNode::update_material_nodetree() void MaterialNode::update_material_nodetree()
{ {
ntreeUpdateTree(CTX_data_main(mContext), ntree); ntreeUpdateTree(CTX_data_main(mContext), ntree);
} }