Blender Git Loki

blacklist language property for sphinx docs, encoding was messing up PDF generation.

skip importing shutil on load.

Merging Blenderplayer modifier fix (U.gameflags |= USER_DISABLE_VBO) from Cucumber.

Fix cycles python error introduced in revision 42138.

Fix part of #29310: secondary point caches for cloth did not get steps
set to correct default, was 10 when supposed to be 1.

Fix #29371: crash deleting objects in outliner. This was introduced in the
bugfix for #28467, it deleted outliner tree while still traversing it.

svn merge ^/trunk/blender -r42116:42139

UI: small fix for forward compatibility, keep this style setting so opening
in older blender versions show correct panel header spacing still.

pep8 edits and avoid naming conflicts with python builtins

BGE patch: [#29285] Video Texture: Avoid slow rescale (non power of 2 support check) by Goran Milovanovic (goran)
"Just a simple check for non power of two support (GLEW_ARB_texture_non_power_of_two), to avoid what seems to be a very slow, and very unnecessary gluScaleImage call."

This is the only part of the VideoTexture that does the POT calculation, so the check seems good.
It would be interesting if some opengl guru would like to benchmark the use of this in other areas of Blender (e.g. 2D Filters, and all GLSL materials).

Note that mipmap should also be supported automatically by this extension, so it's not something to worry about.

Scons / Cycles:
* Add dummy WITH_BF_CYCLES_BINARIES to scons, to be able to copy the .cubin kernels from cmake and have it work.

2.6 Code removal:
* Deleted some #if 0 code, which was either already replaced or won't come back.

Fix #29366: multires crash with meshes that had verts/edges not connected to any face.

(See http://codereview.appspot.com/5431064/ for review of patch)

I've written a convenient function that returns the sibling of a node in the
red-black tree implementation originally implemented by Joshua Leung.

I want to use this get_sibling() function in the future to implement the missing
removal function of the red-black tree implementation.

For now the get_sibling() function just simplifies the get_uncle() function.

Just like the rest of the red-black tree implementation this diff is based on
Wikipedia: http://en.wikipedia.org/wiki/Red%E2%80%93black_tree#Removal

Fix #29369: bpy.data.curves.new(name= "test" , type = 'SURFACE') does not create a surface

This issue it totally related on issue with changing object datablock.
For curves it used to guess object type from curve datablock based on
count of control points in V direction.
This quess fails in case when SurfCircle datablock is trying to be reused
by another surface object or as another sample empty surface databouck used
to be treated as curve.

Store type in Curve when creating new Curve datablock which is used in
this object type quessing function.

Note: Previously saved files wouldn't change behavior at all.

Fix #29306: Alt+N, Enter In Image View Does closes the dialog without executing.

If enter is pressed outside of any button in menu, generate two menu return values:
- UI_RETURN_CANCEL so button wouldn't be executed
- UI_RETURN_POPUP_OK so callback associated with popup block would be executed

Fix #29384: Mesh without polygons + Modifier crashes when switching to sculpt mode

There were some issues with PBVH which prevented working it for meshes without faces.

Discussed with Brecht, for benefits of dynamic-topology-sculpting and so better to
make PBVH survive such things.

Added some extra NULL-pointer checks for this.

Fix wrong camera preset name D35 => D3S.

Adjust BMO_Get/SetIndex syntax so that it can take element pointers directly

Fix for wrong event clipping in open node groups (bug #29383). The internal node blocks of the group were created before the group node block itself, so the node group block clips events for internal nodes. Generally, blocks should be created just like the drawing order.