Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-10-09 03:01:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-10-09 03:01:50 +0300
commite7218e7049972053140d94410aea75e0c3e87c61 (patch)
tree6c73c7d89ccf52cdbce88ec83f0b2052a1038f45 /source/blender/windowmanager
parent9b49a0d971c50d3316b8b752e6a9f35f67fd53c8 (diff)
Cleanup: naming
- immAttrib* -> immAttr* - immSkipAttrib -> immAttrSkip Term 'attr' is a convention for GPU module.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c8
-rw-r--r--source/blender/windowmanager/intern/wm_stereo.c24
2 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0b5fd186e7a..e3c96ff926c 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2053,16 +2053,16 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph
/* draw textured quad */
immBegin(GPU_PRIM_TRI_FAN, 4);
- immAttrib2f(texCoord, 0, 0);
+ immAttr2f(texCoord, 0, 0);
immVertex2f(pos, -radius, -radius);
- immAttrib2f(texCoord, 1, 0);
+ immAttr2f(texCoord, 1, 0);
immVertex2f(pos, radius, -radius);
- immAttrib2f(texCoord, 1, 1);
+ immAttr2f(texCoord, 1, 1);
immVertex2f(pos, radius, radius);
- immAttrib2f(texCoord, 0, 1);
+ immAttr2f(texCoord, 0, 1);
immVertex2f(pos, -radius, radius);
immEnd();
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index aa85dbc04b4..6b6b3bc3cbb 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -106,16 +106,16 @@ void wm_stereo3d_draw_interlace(wmWindow *win, ARegion *ar)
immBegin(GPU_PRIM_TRI_FAN, 4);
- immAttrib2f(texcoord, halfx, halfy);
+ immAttr2f(texcoord, halfx, halfy);
immVertex2f(pos, ar->winrct.xmin, ar->winrct.ymin);
- immAttrib2f(texcoord, 1.0f + halfx, halfy);
+ immAttr2f(texcoord, 1.0f + halfx, halfy);
immVertex2f(pos, ar->winrct.xmax + 1, ar->winrct.ymin);
- immAttrib2f(texcoord, 1.0f + halfx, 1.0f + halfy);
+ immAttr2f(texcoord, 1.0f + halfx, 1.0f + halfy);
immVertex2f(pos, ar->winrct.xmax + 1, ar->winrct.ymax + 1);
- immAttrib2f(texcoord, halfx, 1.0f + halfy);
+ immAttr2f(texcoord, halfx, 1.0f + halfy);
immVertex2f(pos, ar->winrct.xmin, ar->winrct.ymax + 1);
immEnd();
@@ -190,16 +190,16 @@ void wm_stereo3d_draw_sidebyside(wmWindow *win, int view)
immBegin(GPU_PRIM_TRI_FAN, 4);
- immAttrib2f(texcoord, halfx, halfy);
+ immAttr2f(texcoord, halfx, halfy);
immVertex2f(pos, soffx, 0.0f);
- immAttrib2f(texcoord, 1.0f + halfx, halfy);
+ immAttr2f(texcoord, 1.0f + halfx, halfy);
immVertex2f(pos, soffx + (sizex * 0.5f), 0.0f);
- immAttrib2f(texcoord, 1.0f + halfx, 1.0f + halfy);
+ immAttr2f(texcoord, 1.0f + halfx, 1.0f + halfy);
immVertex2f(pos, soffx + (sizex * 0.5f), sizey);
- immAttrib2f(texcoord, halfx, 1.0f + halfy);
+ immAttr2f(texcoord, halfx, 1.0f + halfy);
immVertex2f(pos, soffx, sizey);
immEnd();
@@ -234,16 +234,16 @@ void wm_stereo3d_draw_topbottom(wmWindow *win, int view)
immBegin(GPU_PRIM_TRI_FAN, 4);
- immAttrib2f(texcoord, halfx, halfy);
+ immAttr2f(texcoord, halfx, halfy);
immVertex2f(pos, 0.0f, soffy);
- immAttrib2f(texcoord, 1.0f + halfx, halfy);
+ immAttr2f(texcoord, 1.0f + halfx, halfy);
immVertex2f(pos, sizex, soffy);
- immAttrib2f(texcoord, 1.0f + halfx, 1.0f + halfy);
+ immAttr2f(texcoord, 1.0f + halfx, 1.0f + halfy);
immVertex2f(pos, sizex, soffy + (sizey * 0.5f));
- immAttrib2f(texcoord, halfx, 1.0f + halfy);
+ immAttr2f(texcoord, halfx, 1.0f + halfy);
immVertex2f(pos, 0.0f, soffy + (sizey * 0.5f));
immEnd();