Blender Git Loki

Console Scrolling - reset while typing.
patch from Damir Prebeg with some edits.

Also made it so resizing the console view keeps the lower part of the text in view (could be annoying when you needed to scroll because of a resized view).

I made multitude of fixes based on the comments provided online:

Removed the drawSelectedVerts and added drawSelectedVertices, which uses dm->foreachMappedVert.

In calc_weightpaint_vert_color():
Made the weight paint color black and return instead of input=-1

Made the pose bone selection normal when multi-paint is inactive.

Name fix for functions using mv instead of mvert.

Used vector functions provided by the math lib.

Changed some MEM_callocN references to be stacks.

Changed dm_deform_clear to use ob->derivedDeform primarily

Made the variable "float **changes" into "float (*changes)[2]"

Used CTX_data_active_object() in place of CTX_data_pointer_get_type()

Added the invert selection hotkey "Ctrl+I" to weight paint's vertex mask.

i18n: replace gnu unifont with droid sans font

- Static variables can be initialized with constants only.
- Removed bunifont.ttf.c from datafiles -- it's not actually a
data file. Unicode font loading stuff is not in blenkernel/font.c
- Allocate as much memory for unzipped data as it's needed.
Default read chunk is 512Kb.
- Fixed regression (or just a typo) in setting utf locale.
- Default locale set to en_US:en works fine now.
- Commented put Nepali language in user preferences -- it's
not supported by current droid font and imo it's better to
have nice font for languages we actually have translation for
rather than allowing to choose more languages in user preferences.

Cycles: fix math nodes not working after merge.

Merged changes in the trunk up to revision 40299.

Resurrect the conditional to avoid extra color state changes. Thanks Ender79 for the suggestion!

image button was hard coded to draw the splash screen which it loaded from PNG data on every draw.

now pass the ImBuf when callign the image button so we could have different images in buttons later on.

Cycles:
* Fix node tree identifier. MATERIAL > SHADER.
This fixes some of the node buttons not showing up after recent merge.

Use GL_LINES instead of GL_LINE_LOOP for selected uv edge drawing, avoids an extra conditional and drawing an extra 0 size line per uv.

Fix: Uv edges were incorrectly drawn as selected in uv vert select mode when a sole uv vert was selected.

Cycles: missed these files in merge commit.

Recast/detour: fix some property enum identifiers to follow conventions.

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.

Camera tracking integration
===========================

Fix for crash on pyramid tracker caused by precision error
when calculating pyramid level.

svn merge -r40279:40295 ^/trunk/blender

Nodes: fix nodes in groups not getting socket templates verified, and reserve
some socket flags for cycles to avoid conflicts.

Fix knife midpoint snapping when previous point was a vertex; also reduced snap radius to approximately match crosshairs.

fix for building after merge

Speedup for font drawing, every letter was character was calling:
glGetIntegerv(GL_TEXTURE_2D_BINDING_EXT, &cur_tex);

... with shadow enabled glGetFloatv(GL_CURRENT_COLOR, color) was called twice per character as well.


Now only call glGetFloatv(GL_CURRENT_COLOR, ...) once per string and only when drawing with shadow or blur, texture bind is stored in the font.

Gives 8% overall FPS speedup when displaying heavy UI in my test.

Minor: fixing other UI typos.