[Bf-blender-cvs] [a17bb772a04] blender2.8: Probe: Add object mode volume visualisation

[Clément Foucault]

Commit: a17bb772a04fd34b6a2e03bf2dfde29aa20ec930
Author: Clément Foucault
Date:   Fri Jun 9 23:21:55 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBa17bb772a04fd34b6a2e03bf2dfde29aa20ec930

Probe: Add object mode volume visualisation

===================================================================

M       source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/modes/object_mode.c 
b/source/blender/draw/modes/object_mode.c
index ae144272dc4..0f91ae27903 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1418,8 +1418,32 @@ static void DRW_shgroup_probe(OBJECT_StorageList *stl, 
Object *ob, SceneLayer *s
 
        DRW_shgroup_call_dynamic_add(stl->g_data->probe, ob->obmat[3], color);
 
-       DRW_shgroup_call_dynamic_add(stl->g_data->sphere, color, &prb->distinf, 
ob->obmat);
-       DRW_shgroup_call_dynamic_add(stl->g_data->sphere, color, 
&prb->distfalloff, ob->obmat);
+       if ((prb->flag & PRB_SHOW_INFLUENCE) != 0) {
+               if (prb->attenuation_type == PROBE_BOX) {
+                       DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, 
&prb->distinf, ob->obmat);
+                       DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, 
&prb->distfalloff, ob->obmat);
+               }
+               else {
+                       DRW_shgroup_call_dynamic_add(stl->g_data->sphere, 
color, &prb->distinf, ob->obmat);
+                       DRW_shgroup_call_dynamic_add(stl->g_data->sphere, 
color, &prb->distfalloff, ob->obmat);
+               }
+       }
+
+       if ((prb->flag & PRB_SHOW_PARALLAX) != 0) {
+               if ((prb->flag & PRB_CUSTOM_PARALLAX) != 0) {
+                       float (*obmat)[4];
+
+                       /* TODO object parallax */
+                       obmat = ob->obmat;
+
+                       if (prb->parallax_type == PROBE_BOX) {
+                               DRW_shgroup_call_dynamic_add(stl->g_data->cube, 
color, &prb->distpar, obmat);
+                       }
+                       else {
+                               
DRW_shgroup_call_dynamic_add(stl->g_data->sphere, color, &prb->distpar, obmat);
+                       }
+               }
+       }
 
        DRW_shgroup_call_dynamic_add(stl->g_data->lamp_center_group, 
ob->obmat[3]);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs