[Bf-blender-cvs] [3f43f57731a] master: Cleanup: warnings
Campbell Barton
noreply at git.blender.org
Wed Aug 19 06:17:14 CEST 2020
Commit: 3f43f57731a76046749b02c458234d25130e8221
Author: Campbell Barton
Date: Wed Aug 19 11:37:35 2020 +1000
Branches: master
https://developer.blender.org/rB3f43f57731a76046749b02c458234d25130e8221
Cleanup: warnings
===================================================================
M source/blender/editors/space_node/node_draw.c
M source/blender/makesrna/intern/rna_brush.c
===================================================================
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index e36dc2f4906..814473b0e9a 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -867,7 +867,7 @@ void ED_node_socket_draw(bNodeSocket *sock, const rcti *rect, const float color[
/* ************** Socket callbacks *********** */
-static void node_draw_preview_background(float tile, rctf *rect)
+static void node_draw_preview_background(rctf *rect)
{
GPUVertFormat *format = immVertexFormat();
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
@@ -909,7 +909,7 @@ static void node_draw_preview(bNodePreview *preview, rctf *prv)
scale = yscale;
}
- node_draw_preview_background(BLI_rctf_size_x(prv) / 10.0f, &draw_rect);
+ node_draw_preview_background(&draw_rect);
GPU_blend(GPU_BLEND_ALPHA);
/* premul graphics */
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index fa48cf2f399..f48a7e6715d 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -45,6 +45,7 @@ static const EnumPropertyItem prop_direction_items[] = {
{0, NULL, 0, NULL, NULL},
};
+#ifdef RNA_RUNTIME
static const EnumPropertyItem prop_smooth_direction_items[] = {
{0, "SMOOTH", ICON_ADD, "Smooth", "Smooth the surfae"},
{BRUSH_DIR_IN,
@@ -54,6 +55,7 @@ static const EnumPropertyItem prop_smooth_direction_items[] = {
"Enhance the surface detail"},
{0, NULL, 0, NULL, NULL},
};
+#endif
static const EnumPropertyItem sculpt_stroke_method_items[] = {
{0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"},
More information about the Bf-blender-cvs
mailing list