[Bf-blender-cvs] [c80b760d4a] blender2.8: Immediate Mode: particle_edit.c

[Dalai Felinto]

Commit: c80b760d4a9ce4b7b07a1857534591c97eb773af
Author: Dalai Felinto
Date:   Tue Feb 14 14:27:31 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBc80b760d4a9ce4b7b07a1857534591c97eb773af

Immediate Mode: particle_edit.c

===================================================================

M       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 e22a145b3a..b305c33c3f 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -73,6 +73,8 @@
 #include "ED_particle.h"
 #include "ED_view3d.h"
 
+#include "GPU_immediate.h"
+
 #include "UI_resources.h"
 
 #include "WM_api.h"
@@ -2690,24 +2692,27 @@ static void brush_drawcursor(bContext *C, int x, int y, 
void *UNUSED(customdata)
        ParticleEditSettings *pset= PE_settings(scene);
        ParticleBrushData *brush;
 
-       if (pset->brushtype < 0)
+       if (pset->brushtype < 0) {
                return;
+       }
 
-       brush= &pset->brush[pset->brushtype];
+       brush = &pset->brush[pset->brushtype];
 
        if (brush) {
-               glPushMatrix();
+               unsigned int pos = add_attrib(immVertexFormat(), "pos", 
GL_FLOAT, 2, KEEP_FLOAT);
+               immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-               glTranslatef((float)x, (float)y, 0.0f);
+               immUniformColor4ub(255, 255, 255, 128);
 
-               glColor4ub(255, 255, 255, 128);
                glEnable(GL_LINE_SMOOTH);
                glEnable(GL_BLEND);
-               glutil_draw_lined_arc(0.0, M_PI*2.0, pe_brush_size_get(scene, 
brush), 40);
+
+               imm_draw_lined_circle(pos, (float)x, (float)y, 
pe_brush_size_get(scene, brush), 40);
+
                glDisable(GL_BLEND);
                glDisable(GL_LINE_SMOOTH);
-               
-               glPopMatrix();
+
+               immUnbindProgram();
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs