diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-20 03:11:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-20 15:47:25 +0300 |
commit | 8919c1cad5eceab23d48ca105fc4a3f288853afc (patch) | |
tree | 12e757f0ec9291c9994e624393dc0fd749114602 | |
parent | 3dbe17234471c86aefd29f07dd444fbc07e3e922 (diff) |
Cleanup: clang-format, sorted lists
-rw-r--r-- | intern/cycles/kernel/shaders/node_math.osl | 2 | ||||
-rw-r--r-- | source/blender/compositor/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache.h | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
6 files changed, 6 insertions, 9 deletions
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl index fb59c783770..13e4c91ba10 100644 --- a/intern/cycles/kernel/shaders/node_math.osl +++ b/intern/cycles/kernel/shaders/node_math.osl @@ -17,7 +17,7 @@ #include "stdosl.h" float safe_divide(float a, float b) -{ +{ return (b != 0.0) ? a / b : 0.0; } diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 50b5951f99f..2a8914c8cd9 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -280,8 +280,8 @@ set(SRC nodes/COM_BlurNode.h nodes/COM_BokehBlurNode.cpp nodes/COM_BokehBlurNode.h - nodes/COM_DenoiseNode.h nodes/COM_DenoiseNode.cpp + nodes/COM_DenoiseNode.h nodes/COM_DespeckleNode.cpp nodes/COM_DespeckleNode.h nodes/COM_DilateErodeNode.cpp @@ -491,8 +491,8 @@ set(SRC operations/COM_ConvolutionEdgeFilterOperation.h operations/COM_ConvolutionFilterOperation.cpp operations/COM_ConvolutionFilterOperation.h - operations/COM_DenoiseOperation.h operations/COM_DenoiseOperation.cpp + operations/COM_DenoiseOperation.h operations/COM_DespeckleOperation.cpp operations/COM_DespeckleOperation.h operations/COM_DilateErodeOperation.cpp diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h index 5dadcdc1457..273e97c6e49 100644 --- a/source/blender/draw/intern/draw_cache.h +++ b/source/blender/draw/intern/draw_cache.h @@ -27,8 +27,8 @@ struct GPUBatch; struct GPUMaterial; struct ModifierData; struct Object; -struct ParticleSystem; struct PTCacheEdit; +struct ParticleSystem; void DRW_shape_cache_free(void); void DRW_shape_cache_reset(void); diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 8a5b30df1a4..a0f493d0011 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1071,7 +1071,6 @@ static void region_azones_add_edge(ScrArea *sa, else if (alignment == RGN_ALIGN_LEFT) { region_azone_edge_initialize(sa, ar, AE_RIGHT_TO_TOPLEFT, is_fullscreen); } - } static void region_azones_add(const bScreen *screen, ScrArea *sa, ARegion *ar) @@ -1089,8 +1088,7 @@ static void region_azones_add(const bScreen *screen, ScrArea *sa, ARegion *ar) /* For a split region also continue the azone edge from the next region if this region is aligned * with the next */ if ((ar->alignment & RGN_SPLIT_PREV) && ar->prev) { - region_azones_add_edge( - sa, ar, RGN_ALIGN_ENUM_FROM_MASK(ar->prev->alignment), is_fullscreen); + region_azones_add_edge(sa, ar, RGN_ALIGN_ENUM_FROM_MASK(ar->prev->alignment), is_fullscreen); } if (is_fullscreen) { diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 72fec68070b..7821540d045 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2464,7 +2464,6 @@ static bool is_split_edge(const int alignment, const AZEdge edge) ((alignment == RGN_ALIGN_TOP) && (edge == AE_BOTTOM_TO_TOPLEFT)) || ((alignment == RGN_ALIGN_LEFT) && (edge == AE_RIGHT_TO_TOPLEFT)) || ((alignment == RGN_ALIGN_RIGHT) && (edge == AE_LEFT_TO_TOPRIGHT)); - } static int region_scale_invoke(bContext *C, wmOperator *op, const wmEvent *event) diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 7f6dc66d4a7..f6afa112f08 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1560,7 +1560,7 @@ void view3d_main_region_draw(const bContext *C, ARegion *ar) GPU_pass_cache_garbage_collect(); /* XXX This is in order to draw UI batches with the DRW - * olg context since we now use it for drawing the entire area */ + * old context since we now use it for drawing the entire area. */ gpu_batch_presets_reset(); /* No depth test for drawing action zones afterwards. */ |