Fix #35658: OpenEXR (from Maya) - missing passes

Added some special case for two-component channels name.

Maybe magic could be simplified to just use last char of
channel name as an id, but extra paranoid check never hurts.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@57353 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #35678: Duplicating an object with Displace modifier does not increase the reference count of the texture

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@57354 954f8c5b-7b00-dc11-b283-0030488c597c
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master' into multiview
multiview: bad merge, re-fixing the merge conflict in blender_session.cpp