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>2019-11-09 02:05:30 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-11-09 02:05:30 +0300
commit3ed7ff1f9f603cb1bf19568869ce4b5a12898c60 (patch)
tree03db455d5572e62b068c6075a476db9d7c12a2f1
parent4b229f9e2d5d8863dd795865726971b1dd4bad3a (diff)
parent0a0d735acd6e7f50c59a3ea0d79253aff9a1706f (diff)
Merge branch 'blender-v2.81-release'
-rw-r--r--source/blender/editors/transform/transform.c29
1 files changed, 18 insertions, 11 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 9f53c38c403..dd43e487d92 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -7576,20 +7576,27 @@ static void drawEdgeSlide(TransInfo *t)
}
immEnd();
- immUniformThemeColorShadeAlpha(TH_SELECT, -30, alpha_shade);
- GPU_point_size(ctrl_size);
- immBegin(GPU_PRIM_POINTS, 1);
- if (slp->flipped) {
- if (curr_sv->v_side[1]) {
- immVertex3fv(pos, curr_sv->v_side[1]->co);
+ {
+ float *co_test = NULL;
+ if (slp->flipped) {
+ if (curr_sv->v_side[1]) {
+ co_test = curr_sv->v_side[1]->co;
+ }
}
- }
- else {
- if (curr_sv->v_side[0]) {
- immVertex3fv(pos, curr_sv->v_side[0]->co);
+ else {
+ if (curr_sv->v_side[0]) {
+ co_test = curr_sv->v_side[0]->co;
+ }
+ }
+
+ if (co_test != NULL) {
+ immUniformThemeColorShadeAlpha(TH_SELECT, -30, alpha_shade);
+ GPU_point_size(ctrl_size);
+ immBegin(GPU_PRIM_POINTS, 1);
+ immVertex3fv(pos, co_test);
+ immEnd();
}
}
- immEnd();
immUniformThemeColorShadeAlpha(TH_SELECT, 255, alpha_shade);
GPU_point_size(guide_size);