Blender Git Loki

Code cleanup: avoid warning about bit-shift outside int range

Cycles-Bake: Internal save mode should be the default (since external is not even in the ui)

Bake api: include cleanup

Bake api: define TriTessFace verts as an array (avoids copy)

- no need to calloc hit array.
- rename smoothnormal is_smooth

Bake api cleanup: use RE_bake_ prefix.

Code cleanup: cycles baking

- remove unused headers
- respect 120 line length
- indentation
- was assigning all props to 'ot->prop' for no reason.

Merge remote-tracking branch 'upstream/master' into bake-cycles

Note: as per previous 'master' commits I will need to convert the arrays
to const arrays. Campbell, were you doing that manually? or you have a
script to do so?

Cycles-Bake: better support for multiple materials referring to the same image

This brings performance gain, as well as a bugfix where the margin would advance over one of the images

Cycles-Bake: cleanup (removing uneeded function)

changes to b2ffdf99 (BLI_path_suffix()) - to be squashed

Revert "Cycles-Bake: [review] using MACRO in get_shader_type()"

This reverts commit 1f8c36d02c2b62387c2bb7c3f29ddb722771b2de.

Cycles-Bake: [review] Cycles style cleanup

build fix for windows after 68893054 (IMB buffer functions to take a mask as input)

Actually ... this was a left over from debugging, so Im glad it was spotted

Cycles-Bake: "Clear" option fully supported

IMB buffer functions to take a mask as input

IMB_buffer_byte_from_float_mask and IMB_buffer_float_from_float_mask
The mask make sure the conversion only happens in a few areas of the
buffer.

Cycles-Bake: UI changes: removing External Saving options

Campbell and I discussed and we decided to deliver only the basic feature-set before moving into new additions.
That doesn't mean cage will be removed, but let's reevaluate the need for saving externally after bake-cycles 1.0 gets in master.

If you saved a file with the branch you should do this in the python console:
bpy.context.scene.render.bake.save_mode = 'INTERNAL'

Cycles-Bake: fix building in WindowsXP 32bits SP3

Linux and OSX have no problem with declaring arrays with const ints as the array dimension.
Using MEM_callocN now instead.

Cycles-Bake: bugfix for when no material is present

reported by Thomas Dinges in https://developer.blender.org/D421

Merge remote-tracking branch 'upstream/master' into bake-cycles

(this should fix windows building hopefully)

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Cycles-Bake: silence rna warning and code cleanup