diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-08 02:43:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-08 02:43:34 +0300 |
commit | 04064fb186ae1089a2bf3006f120e68f789b5242 (patch) | |
tree | b73156bffe9063da76a73ac6dab471ee40b7541d | |
parent | d022794cad977229386934e7d25365270671874f (diff) |
Cleanup: use DRW_object_is_* for object checks
Also use const qualifier for object's.
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/basic/basic_engine.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_render.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_render.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 6 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 12 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 10 |
15 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 81182a89f3e..6d7def8f93f 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -102,7 +102,7 @@ typedef enum eObjectVisibilityCheck { OB_VISIBILITY_CHECK_UNKNOWN_RENDER_MODE, } eObjectVisibilityCheck; -bool BKE_object_is_visible(struct Object *ob, const eObjectVisibilityCheck mode); +bool BKE_object_is_visible(const struct Object *ob, const eObjectVisibilityCheck mode); void BKE_object_init(struct Object *ob); struct Object *BKE_object_add_only_object( diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 3279839f8b5..4374046d701 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -304,7 +304,7 @@ void psys_set_current_num(Object *ob, int index); struct LatticeDeformData *psys_create_lattice_deform_data(struct ParticleSimulationData *sim); struct ParticleSystem *psys_orig_get(struct ParticleSystem *psys); -bool psys_in_edit_mode(struct Depsgraph *depsgraph, struct ParticleSystem *psys); +bool psys_in_edit_mode(struct Depsgraph *depsgraph, const struct ParticleSystem *psys); bool psys_check_enabled(struct Object *ob, struct ParticleSystem *psys, const bool use_render_params); bool psys_check_edited(struct ParticleSystem *psys); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index cf6f2e5d842..71cf08e267d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -727,7 +727,7 @@ bool BKE_object_is_mode_compat(const struct Object *ob, eObjectMode object_mode) /** * Return if the object is visible, as evaluated by depsgraph */ -bool BKE_object_is_visible(Object *ob, const eObjectVisibilityCheck mode) +bool BKE_object_is_visible(const Object *ob, const eObjectVisibilityCheck mode) { if ((ob->base_flag & BASE_VISIBLE) == 0) { return false; diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 802c1c6b6b9..7a217f59536 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -307,7 +307,7 @@ static PTCacheEdit *psys_orig_edit_get(ParticleSystem *psys) return psys->orig_psys->edit; } -bool psys_in_edit_mode(Depsgraph *depsgraph, ParticleSystem *psys) +bool psys_in_edit_mode(Depsgraph *depsgraph, const ParticleSystem *psys) { const ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph); if (view_layer->basact == NULL) { @@ -319,7 +319,7 @@ bool psys_in_edit_mode(Depsgraph *depsgraph, ParticleSystem *psys) if (object->mode != OB_MODE_PARTICLE_EDIT) { return false; } - ParticleSystem *psys_orig = psys_orig_get(psys); + const ParticleSystem *psys_orig = psys_orig_get((ParticleSystem *)psys); return (psys_orig->edit || psys->pointcache->edit) && (use_render_params == false); } diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index 2e3fdf37bdb..720b22d58a1 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -125,7 +125,7 @@ static void basic_cache_populate(void *vedata, Object *ob) if (!psys_check_enabled(ob, psys, false)) { continue; } - if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) { continue; } ParticleSettings *part = psys->part; diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 32de4266c82..bea7d000181 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -137,7 +137,7 @@ void EEVEE_cache_populate(void *vedata, Object *ob) } if (DRW_object_is_renderable(ob) && - DRW_check_object_visible_within_active_context(ob)) + DRW_object_is_visible_in_active_context(ob)) { if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) { EEVEE_materials_cache_populate(vedata, sldata, ob, &cast_shadow); diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 2d27bb8e705..a1a244eb615 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1617,7 +1617,7 @@ void EEVEE_hair_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sldata, if (!psys_check_enabled(ob, psys, false)) { continue; } - if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) { continue; } ParticleSettings *part = psys->part; diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index 80d8c066a44..117d48e2dc5 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -163,7 +163,7 @@ void EEVEE_render_cache( EEVEE_hair_cache_populate(vedata, sldata, ob, &cast_shadow); } - if (DRW_check_object_visible_within_active_context(ob)) { + if (DRW_object_is_visible_in_active_context(ob)) { if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) { EEVEE_materials_cache_populate(vedata, sldata, ob, &cast_shadow); } diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 0b318bd974e..d854336cfd0 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -549,7 +549,7 @@ static void gpencil_add_draw_data(void *vedata, Object *ob) void GPENCIL_cache_populate(void *vedata, Object *ob) { /* object must be visible */ - if (!DRW_check_object_visible_within_active_context(ob)) { + if (!DRW_object_is_visible_in_active_context(ob)) { return; } diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c index 41f0c601a13..8dc15472a20 100644 --- a/source/blender/draw/engines/gpencil/gpencil_render.c +++ b/source/blender/draw/engines/gpencil/gpencil_render.c @@ -130,7 +130,7 @@ static void GPENCIL_render_cache( void *vedata, struct Object *ob, struct RenderEngine *UNUSED(engine), struct Depsgraph *UNUSED(depsgraph)) { - if ((ob == NULL) || (DRW_check_object_visible_within_active_context(ob) == false)) { + if ((ob == NULL) || (DRW_object_is_visible_in_active_context(ob) == false)) { return; } diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index 7fbe928d29e..dcb60839387 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -649,7 +649,7 @@ static void workbench_cache_populate_particles(WORKBENCH_Data *vedata, Object *o if (!psys_check_enabled(ob, psys, false)) { continue; } - if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) { continue; } ParticleSettings *part = psys->part; @@ -701,7 +701,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob) return; /* Do not draw solid in this case. */ } - if (!DRW_check_object_visible_within_active_context(ob)) { + if (!DRW_object_is_visible_in_active_context(ob)) { return; } diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 0d4329c9699..2dceb8f609d 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -420,7 +420,7 @@ static void workbench_forward_cache_populate_particles(WORKBENCH_Data *vedata, O if (!psys_check_enabled(ob, psys, false)) { continue; } - if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) { continue; } ParticleSettings *part = psys->part; @@ -487,7 +487,7 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob) return; /* Do not draw solid in this case. */ } - if (!DRW_check_object_visible_within_active_context(ob)) { + if (!DRW_object_is_visible_in_active_context(ob)) { return; } diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 193c2416215..2e91c8fd62d 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -507,11 +507,11 @@ DrawData *DRW_drawdata_ensure( DrawDataFreeCb free_cb); /* Settings */ -bool DRW_object_is_renderable(struct Object *ob); -bool DRW_check_object_visible_within_active_context(struct Object *ob); +bool DRW_object_is_renderable(const struct Object *ob); +bool DRW_object_is_visible_in_active_context(const struct Object *ob); bool DRW_object_is_flat_normal(const struct Object *ob); -bool DRW_check_psys_visible_within_active_context(struct Object *object, struct ParticleSystem *psys); +bool DRW_object_is_visible_psys_in_active_context(const struct Object *object, const struct ParticleSystem *psys); /* Draw commands */ void DRW_draw_pass(DRWPass *pass); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 0566abd3436..f987220e575 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -148,7 +148,7 @@ struct DRWTextStore *DRW_text_cache_ensure(void) /** \name Settings * \{ */ -bool DRW_object_is_renderable(Object *ob) +bool DRW_object_is_renderable(const Object *ob) { BLI_assert(BKE_object_is_visible(ob, OB_VISIBILITY_CHECK_UNKNOWN_RENDER_MODE)); @@ -173,7 +173,7 @@ bool DRW_object_is_renderable(Object *ob) * Return whether this object is visible depending if * we are rendering or drawing in the viewport. */ -bool DRW_check_object_visible_within_active_context(Object *ob) +bool DRW_object_is_visible_in_active_context(const Object *ob) { const eObjectVisibilityCheck mode = DRW_state_is_scene_render() ? OB_VISIBILITY_CHECK_FOR_RENDER : @@ -192,9 +192,9 @@ bool DRW_object_is_flat_normal(const Object *ob) return true; } -bool DRW_check_psys_visible_within_active_context( - Object *object, - struct ParticleSystem *psys) +bool DRW_object_is_visible_psys_in_active_context( + const Object *object, + const ParticleSystem *psys) { const DRWContextState *draw_ctx = DRW_context_state_get(); const Scene *scene = draw_ctx->scene; @@ -1660,7 +1660,7 @@ static bool DRW_render_check_grease_pencil(Depsgraph *depsgraph) { DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob) { - if ((ob->type == OB_GPENCIL) && (DRW_check_object_visible_within_active_context(ob))) { + if ((ob->type == OB_GPENCIL) && (DRW_object_is_visible_in_active_context(ob))) { return true; } } diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 2df2ad57073..9bf5263bacf 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -2281,7 +2281,7 @@ static void DRW_shgroup_relationship_lines( Scene *scene, Object *ob) { - if (ob->parent && DRW_check_object_visible_within_active_context(ob->parent)) { + if (ob->parent && DRW_object_is_visible_in_active_context(ob->parent)) { DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->parent->obmat[3]); DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->obmat[3]); } @@ -2289,11 +2289,11 @@ static void DRW_shgroup_relationship_lines( if (ob->rigidbody_constraint) { Object *rbc_ob1 = ob->rigidbody_constraint->ob1; Object *rbc_ob2 = ob->rigidbody_constraint->ob2; - if (rbc_ob1 && DRW_check_object_visible_within_active_context(rbc_ob1)) { + if (rbc_ob1 && DRW_object_is_visible_in_active_context(rbc_ob1)) { DRW_shgroup_call_dynamic_add(sgl->relationship_lines, rbc_ob1->obmat[3]); DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->obmat[3]); } - if (rbc_ob2 && DRW_check_object_visible_within_active_context(rbc_ob2)) { + if (rbc_ob2 && DRW_object_is_visible_in_active_context(rbc_ob2)) { DRW_shgroup_call_dynamic_add(sgl->relationship_lines, rbc_ob2->obmat[3]); DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->obmat[3]); } @@ -2538,7 +2538,7 @@ static void OBJECT_cache_populate_particles(Object *ob, if (!psys_check_enabled(ob, psys, false)) { continue; } - if (!DRW_check_psys_visible_within_active_context(ob, psys)) { + if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) { continue; } @@ -2624,7 +2624,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) OBJECT_cache_populate_particles(ob, psl); } - if (DRW_check_object_visible_within_active_context(ob) == false) { + if (DRW_object_is_visible_in_active_context(ob) == false) { return; } |