diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-12 13:59:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-12 14:34:55 +0300 |
| commit | f52dc2f371923c22a974df7105245f7e0b8148ee (patch) | |
| tree | bd65af657cf7f06fdb01ee953182562c69189fed /source/blender/draw/modes | |
| parent | 12bd960df9bb9d96477b9913df8aec6fc7d87f95 (diff) | |
Rename probe to light-probe
Probe is a real general term, the new name is used often in docs online.
Diffstat (limited to 'source/blender/draw/modes')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index e1bcb3bf147..e1388346008 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -32,7 +32,7 @@ #include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_object_force.h" -#include "DNA_probe_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_particle_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" @@ -908,7 +908,7 @@ static void OBJECT_cache_init(void *vedata) /* Probe */ static float probeSize = 10.0f; - geom = DRW_cache_probe_get(); + geom = DRW_cache_lightprobe_get(); stl->g_data->probe = shgroup_instance_screenspace(psl->non_meshes, geom, &probeSize); /* Camera */ @@ -1408,18 +1408,18 @@ static void DRW_shgroup_speaker(OBJECT_StorageList *stl, Object *ob, SceneLayer DRW_shgroup_call_dynamic_add(stl->g_data->speaker, color, &one, ob->obmat); } -static void DRW_shgroup_probe(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl) +static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, Object *ob, SceneLayer *sl) { float *color; - Probe *prb = (Probe *)ob->data; + LightProbe *prb = (LightProbe *)ob->data; DRW_object_wire_theme_get(ob, sl, &color); prb->distfalloff = (1.0f - prb->falloff) * prb->distinf; DRW_shgroup_call_dynamic_add(stl->g_data->probe, ob->obmat[3], color); - if ((prb->flag & PRB_SHOW_INFLUENCE) != 0) { - if (prb->attenuation_type == PROBE_BOX) { + if ((prb->flag & LIGHTPROBE_FLAG_SHOW_INFLUENCE) != 0) { + if (prb->attenuation_type == LIGHTPROBE_SHAPE_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); } @@ -1429,11 +1429,11 @@ static void DRW_shgroup_probe(OBJECT_StorageList *stl, Object *ob, SceneLayer *s } } - if ((prb->flag & PRB_SHOW_PARALLAX) != 0) { + if ((prb->flag & LIGHTPROBE_FLAG_SHOW_PARALLAX) != 0) { float (*obmat)[4], *dist; - if ((prb->flag & PRB_CUSTOM_PARALLAX) != 0) { + if ((prb->flag & LIGHTPROBE_FLAG_CUSTOM_PARALLAX) != 0) { dist = &prb->distpar; /* TODO object parallax */ obmat = ob->obmat; @@ -1443,7 +1443,7 @@ static void DRW_shgroup_probe(OBJECT_StorageList *stl, Object *ob, SceneLayer *s obmat = ob->obmat; } - if (prb->parallax_type == PROBE_BOX) { + if (prb->parallax_type == LIGHTPROBE_SHAPE_BOX) { DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &dist, obmat); } else { @@ -1451,7 +1451,7 @@ static void DRW_shgroup_probe(OBJECT_StorageList *stl, Object *ob, SceneLayer *s } } - if ((prb->flag & PRB_SHOW_CLIP_DIST) != 0) { + if ((prb->flag & LIGHTPROBE_FLAG_SHOW_CLIP_DIST) != 0) { static const float cubefacemat[6][4][4] = { {{0.0, 0.0, -1.0, 0.0}, {0.0, -1.0, 0.0, 0.0}, {-1.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 1.0}}, {{0.0, 0.0, 1.0, 0.0}, {0.0, -1.0, 0.0, 0.0}, {1.0, 0.0, 0.0, 0.0}, {0.0, 0.0, 0.0, 1.0}}, @@ -1674,8 +1674,8 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) case OB_SPEAKER: DRW_shgroup_speaker(stl, ob, sl); break; - case OB_PROBE: - DRW_shgroup_probe(stl, ob, sl); + case OB_LIGHTPROBE: + DRW_shgroup_lightprobe(stl, ob, sl); break; case OB_ARMATURE: { |