Scorching Weapons is a feat that adds 1 fire damage to your held metallic weapons. This damage explicitly does not stack with certain other fire damage (emphasis mine):
Scorching Weapons
Prerequisites: Ifrit
Benefit: You gain a +2 bonus on saving throws against fire attacks and spells with the fire descriptor or light descriptor. As a swift action, you can make up to two held manufactured metallic weapons become red-hot for 1 round, dealing 1 additional point of fire damage with a successful hit. This does not stack with other effects that add fire damage to weapons, such as the flaming weapon special ability.
The Elementalist Shifter, however, has the following ability at level 1:
Elemental Strike (Su): At 1st level, as a swift action, an elementalist shifter can charge her melee attacks with elemental energy. The elementalist shifter can charge her attacks only with an element she has chosen with elemental aspect. Once charged, each melee attack the elementalist shifter makes until the start of her next turn deals an additional 1d6 points of energy damage based on the element she chooses when taking this action (see Elemental Aspects on page 79). This additional damage increases by 1d6 at 4th level and every 4 levels thereafter, to a maximum of 6d6 points of energy damage at 20th level. An elementalist shifter can’t use elemental strike while under a polymorph effect. This replaces shifter claws.
Is there a difference between adding fire damage to a weapon and adding fire damage to an attack? Can an ifrit with Scorching Weapons and a level of Elementalist Shifter (choosing fire as her shifter aspect) effectively deal 1d6+1 fire damage with each attack, as long as the attack is made with a manufactured metallic weapon?