Blender Git Loki

joining mesh objects now keeps relative key setting of each keyblock. also joining absolute shapekeys now sorts by time.

code cleanup: make shape key api names consistent with our new convention.

fix for missing NULL check in init_render_texture() (possibly own fault), also remove some redundant code.

fix txt_redo_read_unicode() missing break - reading 4 byte unicode would fail, same fix was made for txt_undo_read_unicode() recently.

fix MESH_OT_tris_convert_to_quads() limit options (uv and vertex color) were not working at all.

fix buffer overrun when 5+ sided faces were used for text drawing.

code cleanup: marker transform was doing some redundant/misleading assignments & checks, remove unused cruft.
also remove some other redundant checks.

fix buffer overrun in make_histogram_view_from_ibuf_byte(), use define for buffer size so this wont happen again.

fix [#32575] Seperate more than one object from a mesh generates additional edges

Color management: fix crashes and memory leaks when using custom OCIO configuration
Also fix some missing color spaces when loading some OCIO configurations, by falling
back to scene linear if role is not found. There can still be some errors in the
console, need to check this further.

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management#OpenColorIO_Configuration

Color management: default to Save as Render when saving an image datablock with
View as Render enabled.

Fix crash editing mask with no image in the image editor.

Fix #31539, painting in image editor while in object mode does not update mipmaps.

While we could disable/enable mipmaps on stroke begin/end, it is a bit hacky (but worthy of consideration for later) for my taste just to paint in the image editor. Instead we generate mipmaps on the fly. Since we can update texture levels below the first only with GPU mipmapping, partial update when painting in the image editor will actually work only with GPU mipmapping from now on (which is fast enough I hope not to get any lags!).

Fix for own r50715 (static func is much better here!)...

do_version fix files with bad keyblock uid caused by byg [#31569]

fix [#31569] Shapekey w/ Driver - Shapekey Influences Disappears After Going to Edit Mode

joining meshes would allow shape key UID's not to be unique.
This was caused by join adding new key blocks inline, now use add_keyblock() like everywhere else does.

-Wnonnull flag is not for C++. I think we all know it by now, time to
get rid of it.

don't divide by zero in get_ss_weights() which would set values - only to be overwritten.
useful when using --debug-fpe since this isnt and exceptional case.

Revert part of rev50719, it's not actually needed and it always
invalidates render result display buffers.

Ceres: resolve no previous declarations warnings

Currently done as patch applied on bundling, would forward it to Ceres developers.