Left: HR diagram showing evolutionary tracks of non-rotating stars with initial masses between 9 M_⊙ and 120 M_⊙ at solar metallicity (Z = 0.014). The diamonds correspond to the temperature computed by the Geneva code and are not corrected by the effects of the stellar wind (T_⋆), and the squares correspond to the values of T_eff computed either with CMFGEN (for T_eff > 8000 K), or assumed to be equal to T_⋆ for RSGs (causing the squares and diamonds to overlap). Right: similar to the left panel, but for rotating stars with initial υ_rot/υ_crit = 0.4. Except for the non-rotating 23 and 50 M_⊙ and the rotating 18 and 28 M_⊙ models, evolutionary tracks are from Ekström et al. (2012).