blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Aaron Carlisle 2021-09-05 23:25:36 -04:00
parent bf0ac711fd
commit 91bca410c0
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/intern/COM_Converter.cc
View File

@ -41,7 +41,6 @@
#include "COM_ColorExposureNode.h"
#include "COM_ColorMatteNode.h"
#include "COM_ColorNode.h"
#include "COM_PosterizeNode.h"
#include "COM_ColorRampNode.h"
#include "COM_ColorSpillNode.h"
#include "COM_ColorToBWNode.h"
@ -91,6 +90,7 @@
#include "COM_OutputFileNode.h"
#include "COM_PixelateNode.h"
#include "COM_PlaneTrackDeformNode.h"
#include "COM_PosterizeNode.h"
#include "COM_RenderLayersNode.h"
#include "COM_RotateNode.h"
#include "COM_ScaleNode.h"

2
source/blender/compositor/nodes/COM_PosterizeNode.cc
View File

@ -17,8 +17,8 @@
*/
#include "COM_PosterizeNode.h"
#include "COM_PosterizeOperation.h"
#include "COM_ExecutionSystem.h"
#include "COM_PosterizeOperation.h"
namespace blender::compositor {

6
source/blender/draw/engines/overlay/shaders/grid_background_frag.glsl
View File

@ -6,7 +6,7 @@ out vec4 fragColor;
void main()
{
fragColor = color;
float scene_depth = texelFetch(depthBuffer, ivec2(gl_FragCoord.xy), 0).r;
fragColor.a = (scene_depth == 1.0) ? 1.0 : 0.0;
fragColor = color;
float scene_depth = texelFetch(depthBuffer, ivec2(gl_FragCoord.xy), 0).r;
fragColor.a = (scene_depth == 1.0) ? 1.0 : 0.0;
}

3
source/blender/editors/gpencil/gpencil_utils.c
View File

@ -3284,7 +3284,8 @@ bGPDstroke *ED_gpencil_stroke_nearest_to_ends(bContext *C,
gpencil_point_to_parent_space(pt, diff_mat, &pt_parent);
gpencil_point_to_xy_fl(gsc, gps, &pt_parent, &pt2d_target_end[0], &pt2d_target_end[1]);
/* If the distance to the original stroke extremes is too big, the stroke must not be joined. */
/* If the distance to the original stroke extremes is too big, the stroke must not be joined.
*/
if ((len_squared_v2v2(ctrl1, pt2d_target_start) > radius_sqr) &&
(len_squared_v2v2(ctrl1, pt2d_target_end) > radius_sqr) &&
(len_squared_v2v2(ctrl2, pt2d_target_start) > radius_sqr) &&

2
source/blender/sequencer/intern/effects.c
View File

@ -3188,7 +3188,7 @@ float seq_speed_effect_target_frame_get(Scene *scene,
case SEQ_SPEED_STRETCH: {
/* Only right handle controls effect speed! */
const float target_content_length = seq_effect_speed_get_strip_content_length(source) -
source->startofs;
source->startofs;
const float speed_effetct_length = seq_speed->enddisp - seq_speed->startdisp;
const float ratio = frame_index / speed_effetct_length;
target_frame = target_content_length * ratio;