Merge branch 'master' into blender2.8

[blender.git] / source / blender / editors / physics / particle_edit.c

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 27ea7e09fd60b3171c2c9dcc66e7d5919c4929c5..fb3cfdc86b2a006dff9e9b878de120cb188d2dc9 100644 (file)
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2712,7 +2712,7 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
        brush = &pset->brush[pset->brushtype];
 
        if (brush) {
-               unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
+               unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
                immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
                immUniformColor4ub(255, 255, 255, 128);