diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 15:27:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 15:30:31 +0300 |
| commit | 2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (patch) | |
| tree | ce9baf87f55adff9f85e96283b6aef2a0176220c /source/blender/draw/engines/eevee | |
| parent | b8e8c0e325d213f2dcf4adad5506989fa224716e (diff) | |
Cleanup: rename BASE_FROMDUPLI -> BASE_FROM_DUPLI
Matches `BASE_FROM_SET`.
Diffstat (limited to 'source/blender/draw/engines/eevee')
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 6a2ca982d53..23db700d8d7 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -145,7 +145,7 @@ void EEVEE_cache_populate(void *vedata, Object *ob) /* do not add any scene light sources to the cache */ } else if (ob->type == OB_LIGHTPROBE) { - if ((ob->base_flag & BASE_FROMDUPLI) != 0) { + if ((ob->base_flag & BASE_FROM_DUPLI) != 0) { /* TODO: Special case for dupli objects because we cannot save the object pointer. */ } else { diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 67cca698ce7..a41e3ec48f0 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -351,7 +351,7 @@ void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob) eevee_light_setup(ob, evli); /* We do not support shadowmaps for dupli lamps. */ - if ((ob->base_flag & BASE_FROMDUPLI) != 0) { + if ((ob->base_flag & BASE_FROM_DUPLI) != 0) { linfo->num_light++; return; } @@ -463,7 +463,7 @@ void EEVEE_lights_cache_shcaster_material_add( /* Make that object update shadow casting lamps inside its influence bounding box. */ void EEVEE_lights_cache_shcaster_object_add(EEVEE_ViewLayerData *sldata, Object *ob) { - if ((ob->base_flag & BASE_FROMDUPLI) != 0) { + if ((ob->base_flag & BASE_FROM_DUPLI) != 0) { /* TODO: Special case for dupli objects because we cannot save the object pointer. */ return; } diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 00b77eee19b..00990233cde 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1547,7 +1547,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld /* XXX TODO rewrite this to include the dupli objects. * This means we cannot exclude dupli objects from reflections!!! */ - if ((ob->base_flag & BASE_FROMDUPLI) == 0) { + if ((ob->base_flag & BASE_FROM_DUPLI) == 0) { oedata = EEVEE_object_data_ensure(ob); oedata->ob = ob; oedata->test_data = &sldata->probes->vis_data; diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 4fffa3f285c..b3042f8fcf8 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -497,7 +497,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved DRW_shgroup_uniform_vec3(grp, "volumeOrcoSize", texcosize, 1); /* Smoke Simulation */ - if (((ob->base_flag & BASE_FROMDUPLI) == 0) && + if (((ob->base_flag & BASE_FROM_DUPLI) == 0) && (md = modifiers_findByType(ob, eModifierType_Smoke)) && (modifier_isEnabled(scene, md, eModifierMode_Realtime))) { |