diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-10 00:03:21 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-10 00:03:21 +0300 |
| commit | 05517c9bedfdd6afbae0a7d99dbbaba54563303b (patch) | |
| tree | 8227f5feb22217e7278a65f4b6c1d1f0b7a29eeb /source/blender/editors/transform/transform_generics.c | |
| parent | ff11750ee9925d2c75193e1e7cbaccec86855fa8 (diff) | |
| parent | 07e368cb5f6a4f73164a70794e884970d171d909 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcachetemp-eeveelightcache
# Conflicts:
# source/blender/draw/engines/eevee/eevee_lightprobes.c
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index b007a8d1b99..3f71915a690 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1132,7 +1132,7 @@ void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis } UI_make_axis_color(col, col2, axis); - unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT); + uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); immUniformColor3ubv(col2); |