diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-21 03:24:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-21 03:24:19 +0300 |
| commit | ff10ba8c26a9e4ec571da4782312790024bcfb0b (patch) | |
| tree | cff4c021a498534c9822aecdabc4f0d10c4c07da /source/blender/draw/intern | |
| parent | dbe960fdee7fe7630331bd33086ba5c5e1cb1115 (diff) | |
Cleanup: rename terms count/num to len
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/DRW_render.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index e7bef92d437..96525a47c77 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -531,7 +531,7 @@ void DRW_state_lock(DRWState state); void DRW_state_invert_facing(void); -void DRW_state_clip_planes_count_set(uint plane_len); +void DRW_state_clip_planes_len_set(uint plane_len); void DRW_state_clip_planes_reset(void); /* Culling, return true if object is inside view frustum. */ diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index c442921af8f..9a2e03732f4 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -362,7 +362,7 @@ typedef struct DRWManager { /* View dependent uniforms. */ DRWMatrixState original_mat; /* Original rv3d matrices. */ int override_mat; /* Bitflag of which matrices are overridden. */ - int num_clip_planes; /* Number of active clipplanes. */ + int clip_planes_len; /* Number of active clipplanes. */ bool dirty_mat; /* keep in sync with viewBlock */ diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 5ac102084cd..e5654ab2a64 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -270,7 +270,7 @@ void drw_state_set(DRWState state) int test; if ((test = CHANGED_TO(DRW_STATE_CLIP_PLANES))) { if (test == 1) { - for (int i = 0; i < DST.num_clip_planes; ++i) { + for (int i = 0; i < DST.clip_planes_len; ++i) { glEnable(GL_CLIP_DISTANCE0 + i); } } @@ -436,15 +436,15 @@ void DRW_state_invert_facing(void) * and if the shaders have support for it (see usage of gl_ClipDistance). * Be sure to call DRW_state_clip_planes_reset() after you finish drawing. **/ -void DRW_state_clip_planes_count_set(uint plane_len) +void DRW_state_clip_planes_len_set(uint plane_len) { BLI_assert(plane_len <= MAX_CLIP_PLANES); - DST.num_clip_planes = plane_len; + DST.clip_planes_len = plane_len; } void DRW_state_clip_planes_reset(void) { - DST.num_clip_planes = 0; + DST.clip_planes_len = 0; } /** \} */ |