Commit: ff10ba8c26a9e4ec571da4782312790024bcfb0b
Author: Campbell Barton
Date: Mon Jan 21 11:24:19 2019 +1100
Branches: master
https://developer.blender.org/rBff10ba8c26a9e4ec571da4782312790024bcfb0b
Cleanup: rename terms count/num to len
===================================================================
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/workbench/workbench_data.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.h
M source/blender/draw/intern/draw_manager_exec.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c
b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 5f58724134d..52bc4b9c55f 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -898,7 +898,7 @@ static void lightbake_render_scene_reflected(int layer,
EEVEE_BakeRenderData *us
sldata->clip_data.clip_planes[0][3] += eplanar->clipsta;
/* Set clipping plane */
DRW_uniformbuffer_update(sldata->clip_ubo, &sldata->clip_data);
- DRW_state_clip_planes_count_set(1);
+ DRW_state_clip_planes_len_set(1);
GPU_framebuffer_bind(fbl->planarref_fb);
GPU_framebuffer_clear_depth(fbl->planarref_fb, 1.0);
diff --git a/source/blender/draw/engines/workbench/workbench_data.c
b/source/blender/draw/engines/workbench/workbench_data.c
index e70b33d047a..6c65bafb4e3 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -93,7 +93,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
if (rv3d->rflag & RV3D_CLIPPING) {
wpd->world_clip_planes_len = (rv3d->viewlock &
RV3D_BOXCLIP) ? 4 : 6;
memcpy(wpd->world_clip_planes, rv3d->clip,
sizeof(float[4]) * wpd->world_clip_planes_len);
-
DRW_state_clip_planes_count_set(wpd->world_clip_planes_len);
+
DRW_state_clip_planes_len_set(wpd->world_clip_planes_len);
}
else {
wpd->world_clip_planes_len = 0;
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;
}
/** \} */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
