    const UIScene *scene = &s->scene;
    // Draw vision path
    update_track_data(s, false, &s->track_vertices[0]);
  
    if (scene->engaged) {
      // Draw MPC path when engaged
      update_track_data(s, true, &s->track_vertices[1]);
    }
  }
  
 
</s> remove   if (scene->engaged) {
 </s> add   if (scene->controls_state.getEnabled()) { </s> remove   if(s->model_changed) {
 </s> add   if(s->sm->updated("model")) { </s> remove   const int face_x = (valid_frame_x + face_size + (bdr_s * 2)) + (scene->is_rhd ? valid_frame_w - box_h / 2:0);
  const int face_y = (box_y + box_h - face_size - bdr_s - (bdr_s * 1.5));
  ui_draw_circle_image(s->vg, face_x, face_y, face_size, s->img_face, scene->face_prob > 0.4);
 </s> add   const int x = (valid_frame_x + face_size + (bdr_s * 2)) + (scene->is_rhd ? valid_frame_w - box_h / 2:0);
  const int y = (box_y + box_h - face_size - bdr_s - (bdr_s * 1.5));
  ui_draw_circle_image(s->vg, x, y, face_size, s->img_face, scene->driver_state.getFaceProb() > 0.4); </s> remove     s->model_changed = false;
 </s> add  </s> remove static void draw_lead(UIState *s, float d_rel, float v_rel, float y_rel){
 </s> add static void draw_lead(UIState *s, const cereal::RadarState::LeadData::Reader &lead){
  if (scene->controls_state.getEnabled()) {
    const UIScene *scene = &s->scene;
    // Draw vision path
    update_track_data(s, false, &s->track_vertices[0]);
  
  if (scene->controls_state.getEnabled()) {
      // Draw MPC path when engaged
      update_track_data(s, true, &s->track_vertices[1]);
    }
  }
  
keep keep keep keep replace keep keep keep keep keep
 ui.cc: remove variables from UIScene, use event::Reader to get data  (#1585)

* use struct to store lead status

* remove white space

* use RadarState::LeadData::Reader

* use reader to get thermal data

* use reader

* continue

* remove variables

reset submodules,fix some errors

reset submodules

revert

* remove s->scene.gps_planner_active

* modify

* cleanup

* done

* resolve conflict

* remove irrelevant comment

* remove white space 
selfdrive/ui/paint.cc