bugfix [#36724] Ctrl+F in text editor opens Toolbar, but no longer closes it

(added Ctrl+P as a toggle to show Properties)

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60270 954f8c5b-7b00-dc11-b283-0030488c597c
Text Editor: 'Find' (in the Edit menu) was pointing to the wrong operator

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60271 954f8c5b-7b00-dc11-b283-0030488c597c
OSX/scons: fix linking errors due bf_intern_ghostndof3dconnexion was build even if no 3Dmouseware was detected

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60272 954f8c5b-7b00-dc11-b283-0030488c597c
bugfix: [#36786] customdata layers are not merging taken the names into consideration
(which is also "[#36749] Joining objects with more than one uv map depends on list order")

Thanks Bastien Montagne and Brecht van Lommel for reviewing and some advice.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60288 954f8c5b-7b00-dc11-b283-0030488c597c
Fix [#36788] changing the built in keying set prints "attempt to free NULL pointer" to console.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60291 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup: whitespace & odd indentation


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60293 954f8c5b-7b00-dc11-b283-0030488c597c
Fix [#36791]: Fire ignores force fields when smoke is set to 0.0

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60316 954f8c5b-7b00-dc11-b283-0030488c597c
Fix potential usage of wrong track when setting axis for scene orientation

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60323 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #36797 make linked node groups local does not work. Node tree library functions where missing the ntreeMakeLocal entry, was still marked as 'not implemented'.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60324 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #36790, OSL point parameters of shader nodes not initialized correctly from UI inputs.
normal and point parameter types of OSL shaders are creating SOCK_VECTOR sockets in the script node. When these sockets are in turn used to define the fixed input values for these parameters they get
converted as OSL vector always, losing the distinction of vector/normal/point. To prevent OSL rejecting the value due to type mismatch, explicitly define the parameter defaults in the OSL script node
compiler function as vector, normal and point (unused types will simply be ignored).

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60325 954f8c5b-7b00-dc11-b283-0030488c597c
Minor cleanup for own commit, removed unused line.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60326 954f8c5b-7b00-dc11-b283-0030488c597c
Further fix for #36382: bake buttons for linked objects could be grayed out
when they shouldn't be.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60329 954f8c5b-7b00-dc11-b283-0030488c597c
Merge branch 'master' into uv_join