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:
authorMike Erwin <significant.bit@gmail.com>2017-04-15 08:29:25 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-15 08:29:56 +0300
commit4b043994e8795f37e9227362fe24fd66d45c6b39 (patch)
tree921b417669349cc5cc592634bf7b304a4f3820de /source/blender/editors/space_view3d/view3d_draw.c
parentff3942505a8d861d0024ce4e95bd80da6ee303de (diff)
GPU Matrix API: clean up after 2D-3D unification
See GPU_matrix.h & gpu_matrix.c for the important changes. Other files are mostly just updated to use the latest API. - remove unused functions, defines, enums, comments - remove "3D" from function names - init to Identity transform (otherwise empty stack) - gpuMatrixReset lets outside code return to initial state Part of T49450 Follow up to D2626 and 49fc9cff3b90
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index c9f70945866..802c3f9b96b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -209,8 +209,8 @@ static void view3d_main_region_setup_view(Scene *scene, View3D *v3d, ARegion *ar
ED_view3d_update_viewmat(scene, v3d, ar, viewmat, winmat);
/* set for opengl */
- gpuLoadProjectionMatrix3D(rv3d->winmat);
- gpuLoadMatrix3D(rv3d->viewmat);
+ gpuLoadProjectionMatrix(rv3d->winmat);
+ gpuLoadMatrix(rv3d->viewmat);
}
static bool view3d_stereo3d_active(const bContext *C, Scene *scene, View3D *v3d, RegionView3D *rv3d)
@@ -773,7 +773,7 @@ static bool view3d_draw_render_draw(const bContext *C, Scene *scene,
/* rendered draw */
gpuPushMatrix();
float original_proj[4][4];
- gpuGetProjectionMatrix3D(original_proj);
+ gpuGetProjectionMatrix(original_proj);
ED_region_pixelspace(ar);
if (clip_border) {
@@ -801,7 +801,7 @@ static bool view3d_draw_render_draw(const bContext *C, Scene *scene,
glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
}
- gpuLoadProjectionMatrix3D(original_proj);
+ gpuLoadProjectionMatrix(original_proj);
gpuPopMatrix();
return true;
@@ -1475,8 +1475,8 @@ static void view3d_draw_grid(const bContext *C, ARegion *ar)
*(&grid_unit) = NULL; /* drawgrid need this to detect/affect smallest valid unit... */
drawgrid(&scene->unit, ar, v3d, &grid_unit);
- gpuLoadProjectionMatrix3D(rv3d->winmat);
- gpuLoadMatrix3D(rv3d->viewmat);
+ gpuLoadProjectionMatrix(rv3d->winmat);
+ gpuLoadMatrix(rv3d->viewmat);
}
else {
drawfloor(scene, v3d, &grid_unit, false);