[Bf-blender-cvs] [4949a62d4d7] master: Overlay Engine: Add back selectability of planar lightprobe data plane
Clément Foucault
noreply at git.blender.org
Thu Dec 5 00:44:16 CET 2019
Commit: 4949a62d4d73d3185576a33a893701c0bf02dcfb
Author: Clément Foucault
Date: Wed Dec 4 22:32:08 2019 +0100
Branches: master
https://developer.blender.org/rB4949a62d4d73d3185576a33a893701c0bf02dcfb
Overlay Engine: Add back selectability of planar lightprobe data plane
===================================================================
M source/blender/draw/engines/overlay/overlay_extra.c
M source/blender/draw/engines/overlay/overlay_private.h
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c
index 500e40b08e5..53a743eb124 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@ -143,6 +143,7 @@ void OVERLAY_extra_cache_init(OVERLAY_Data *vedata)
cb->probe_cube = BUF_INSTANCE(grp_sub, format, DRW_cache_lightprobe_planar_get());
cb->probe_grid = BUF_INSTANCE(grp_sub, format, DRW_cache_lightprobe_grid_get());
cb->probe_planar = BUF_INSTANCE(grp_sub, format, DRW_cache_lightprobe_planar_get());
+ cb->solid_quad = BUF_INSTANCE(grp_sub, format, DRW_cache_quad_get());
cb->speaker = BUF_INSTANCE(grp_sub, format, DRW_cache_speaker_get());
grp_sub = DRW_shgroup_create_sub(grp);
@@ -759,6 +760,10 @@ void OVERLAY_lightprobe_cache_populate(OVERLAY_Data *vedata, Object *ob)
case LIGHTPROBE_TYPE_PLANAR:
DRW_buffer_add_entry(cb->probe_planar, color_p, &instdata);
+ if (DRW_state_is_select() && (prb->flag & LIGHTPROBE_FLAG_SHOW_DATA)) {
+ DRW_buffer_add_entry(cb->solid_quad, color_p, &instdata);
+ }
+
if (show_influence) {
normalize_v3_length(instdata.mat[2], prb->distinf);
DRW_buffer_add_entry(cb->empty_cube, color_p, &instdata);
diff --git a/source/blender/draw/engines/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h
index b2399daebe2..fb30b9535cd 100644
--- a/source/blender/draw/engines/overlay/overlay_private.h
+++ b/source/blender/draw/engines/overlay/overlay_private.h
@@ -166,6 +166,8 @@ typedef struct OVERLAY_ExtraCallBuffers {
DRWCallBuffer *probe_cube;
DRWCallBuffer *probe_grid;
+ DRWCallBuffer *solid_quad;
+
DRWCallBuffer *speaker;
DRWShadingGroup *extra_wire;
More information about the Bf-blender-cvs
mailing list