forked from bartvdbraak/blender
Cleanup: quite old-style-declaration warning, strip trailing space
This commit is contained in:
parent
3bbb39ecc1
commit
0fa36c81d9
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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()
|
||||
|
@ -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}
|
||||
|
@ -102,4 +102,4 @@ typedef int bool2[2];
|
||||
typedef int bool3[2];
|
||||
typedef int bool4[4];
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -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);
|
||||
.do_static_compilation(true);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user