Commit: 0fa36c81d906264c340cecc457656acf673770cb
Author: Campbell Barton
Date: Tue Jan 18 10:25:37 2022 +1100
Branches: master
https://developer.blender.org/rB0fa36c81d906264c340cecc457656acf673770cb
Cleanup: quite old-style-declaration warning, strip trailing space
===================================================================
M release/scripts/modules/keyingsets_utils.py
M source/blender/editors/screen/glutil.c
M source/blender/freestyle/CMakeLists.txt
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/intern/gpu_shader_shared_utils.h
M source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh
M
source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh
M source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
M source/blender/nodes/composite/nodes/node_composite_scene_time.cc
===================================================================
diff --git a/release/scripts/modules/keyingsets_utils.py
b/release/scripts/modules/keyingsets_utils.py
index 84a01ef3666..0dd06995ed3 100644
--- a/release/scripts/modules/keyingsets_utils.py
+++ b/release/scripts/modules/keyingsets_utils.py
@@ -245,7 +245,7 @@ def RKS_GEN_custom_props(_ksi, _context, ks, data):
# Can technically happen, but there is no known case.
continue
if rna_property is None:
- # In this case the property cannot be converted to an
+ # In this case the property cannot be converted to an
# FCurve-compatible value, so we can't keyframe it anyways.
continue
if rna_property.rna_type not in prop_type_compat:
diff --git a/source/blender/editors/screen/glutil.c
b/source/blender/editors/screen/glutil.c
index 0ddede017e2..03e817c467d 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -86,7 +86,7 @@ void immDrawPixelsTexScaledFullSize(const
IMMDrawPixelsTexState *state,
const float yzoom,
const float color[4])
{
- const static float white[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static const float white[4] = {1.0f, 1.0f, 1.0f, 1.0f};
const float draw_width = img_w * scaleX * xzoom;
const float draw_height = img_h * scaleY * yzoom;
/* Downscaling with regular bilinear interpolation (i.e. #GL_LINEAR) doesn't
give good filtering
diff --git a/source/blender/freestyle/CMakeLists.txt
b/source/blender/freestyle/CMakeLists.txt
index 47da6bc55f6..d16787714c9 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -595,6 +595,6 @@ endif()
blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-if(COMMAND target_precompile_headers)
+if(COMMAND target_precompile_headers)
target_precompile_headers(bf_freestyle PRIVATE FRS_precomp.h)
endif()
diff --git a/source/blender/gpu/CMakeLists.txt
b/source/blender/gpu/CMakeLists.txt
index a525986e1cd..691c131b1c0 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -481,9 +481,9 @@ if(WITH_GPU_SHADER_BUILDER)
${PLATFORM_LINKLIBS}
)
target_include_directories(shader_builder PRIVATE ${INC}
${CMAKE_CURRENT_BINARY_DIR})
-
+
set(BAKED_CREATE_INFOS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shader_baked.hh)
-
+
add_custom_command(
OUTPUT
${BAKED_CREATE_INFOS_FILE}
diff --git a/source/blender/gpu/intern/gpu_shader_shared_utils.h
b/source/blender/gpu/intern/gpu_shader_shared_utils.h
index f2e2aab208c..1097547e5ae 100644
--- a/source/blender/gpu/intern/gpu_shader_shared_utils.h
+++ b/source/blender/gpu/intern/gpu_shader_shared_utils.h
@@ -102,4 +102,4 @@ typedef int bool2[2];
typedef int bool3[2];
typedef int bool4[4];
-#endif
\ No newline at end of file
+#endif
diff --git
a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
index 56c30e79e6d..bf746eae9b4 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
@@ -36,4 +36,4 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_borders)
.push_constant(25, Type::INT, "cornerLen")
.vertex_source("gpu_shader_2D_area_borders_vert.glsl")
.fragment_source("gpu_shader_2D_area_borders_frag.glsl")
- .do_static_compilation(true);
\ No newline at end of file
+ .do_static_compilation(true);
diff --git
a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
index b9b4381eb50..b94556bbb25 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
@@ -37,4 +37,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)
.vertex_source("gpu_shader_2D_image_rect_vert.glsl")
.fragment_source("gpu_shader_image_color_frag.glsl")
.do_static_compilation(true);
-
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh
b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh
index 5fb6c61c5f9..5c8410baf04 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh
@@ -48,4 +48,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)
.fragment_source("gpu_shader_gpencil_stroke_frag.glsl")
.typedef_source("GPU_shader_shared.h")
.do_static_compilation(true);
-
\ No newline at end of file
diff --git
a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
index 0d2daf7388d..98a1fcf5b37 100644
---
a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
+++
b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
@@ -36,4 +36,3 @@
GPU_SHADER_CREATE_INFO(gpu_shader_instance_varying_color_varying_size)
.fragment_source("gpu_shader_flat_color_frag.glsl")
.additional_info("gpu_srgb_to_framebuffer_space")
.do_static_compilation(true);
-
\ No newline at end of file
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh
b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh
index 8e352af6c1f..f8cb94e52d0 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh
@@ -44,4 +44,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_keyframe_shape)
.vertex_source("gpu_shader_keyframe_shape_vert.glsl")
.fragment_source("gpu_shader_keyframe_shape_frag.glsl")
.do_static_compilation(true);
-
\ No newline at end of file
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
b/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
index a115972694e..2c17a494d76 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh
@@ -43,4 +43,3 @@ GPU_SHADER_CREATE_INFO(gpu_shader_text)
.fragment_source("gpu_shader_text_frag.glsl")
.additional_info("gpu_srgb_to_framebuffer_space")
.do_static_compilation(true);
-
\ No newline at end of file
diff --git a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
index 845390665f2..5c53c1df237 100644
--- a/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_scene_time.cc
@@ -36,4 +36,4 @@ void register_node_type_cmp_scene_time()
cmp_node_type_base(&ntype, CMP_NODE_SCENE_TIME, "Scene Time",
NODE_CLASS_INPUT);
ntype.declare = blender::nodes::cmp_node_scene_time_declare;
nodeRegisterType(&ntype);
-}
\ No newline at end of file
+}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
