The set of plain division of $n$ into $r$ parts is in bijection with the set of divisions of $n$ into distinct parts _whose largest part is equal to $r$_. The bijection is conjugation, i.e. reflecting the Ferrer's diagram. Since there must be a part of size $r$, the factor must be $x^r$ instead of $(1+x^r)$, while all other parts are the same as what you had. Therefore, the generating function is $$ (1+x)(1+x^2)\dots(1+x^{r-1})x^r. $$ Note that the coefficient of $x^{15}$ in $(1+x)\cdots(1+x^5)x^6$ is indeed $3$.