I do all my sets in P4, make the mats up with BUM files, but don't put any Bump mapping at all in the CR2 itself (but your not going to have CR2s, I gather) I then put that version of the MAT in a P4 pose folder, make a copy of the P4 folder called PP folder (for ProPack and later versions), then do a simple search and replace for .bum to .jpg in the PP folder for each MAT. P4 will seem to use JPG bump maps, incidently, or rather it will not generate an error message, but the result is all weird.