Blender Git Loki

Fix T4284: Drawing modified curves crashes

Fix bug reported by kopias on irc, crash when attempting to set canvas
with a non-mesh object selected

Fix T42175: Modifiers don't render in sculpt mode using multires

Modifier stack should ignore sculpt restrictions when creating derived render.

Fix T42630: Triangulate returns invalid face-map

Triangulate with beautify caused a bug when there were existing edges
could make the bmesh-operator return an invalid face-map.

Now the beauty is calculated on the 2d-tri's resulting from polyfill,
its simpler and faster.

Cleanup: remove scanfill define for polyfill code

also rename vars which were previously used for scanfill.

Add edgehash remove, clear functions, Heap clear

Edgehash was missing removal functions (remove, popkey, clear),
since it wasn't needed so far, but is based on same code as ghash which has them.

also add heap clear() method so we can reuse heaps.

(needed for upcoming fix).

Cleanup: simplify heap popmin

Cleanup: remove unused pointer in Heap

Fix Mesh Objects with missing textures or wrong texture path now import without texture

Fix T42824: Proxy bone custom-shape lost on undo

Fix T42838: Make dupli's real use_hierarchy fails

Regression since the dupli-object refactor.

Cycles: Fix compilation error with MinGW and logging enabled

Docs: reference the new manual

BMesh: ensure iterator macros assign to valid types

note, this is for C++ code which expects a cast, (will be added later)
also add a macro for nop-expressions (EXPR_NOP),
when we never want an expression to be evaluated, but it should still be valid.

Cleanup: spelling

Cleanup: remove unused operator-type member

Cleanup: Minor edits to widget emboss code

* Rename "emboss" to "widget_emboss"
* Remove duplicated UI_GetThemeColor4ubv function

I made sure version bump and Save User Settings are working correctly ;P

Fix non-Windows SCons compiling error after IME merge

Forgot to add new files in recent IME commit

Sorry, my bad :/

Bugfix T42774: BSurface addon doesn't work on new builds

It turns out that several important modelling addons depend on the assumption
that Grease Pencil data gets created on the active object instead of on scene
level. This commit adds a toggle for setting whether new Grease Pencil data
is created on scene or object level.

These work as follows:
* "Scene" = The behaviour originally introduced as part of the GPencil_EditStrokes
changes. New strokes are added to the scene instead of the active object, making
it easier to manage things when working with Grease Pencil in general.
* "Object" = The previous behaviour (from 2.50 to 2.72), where new strokes are added
to the active object. This is now being reintroduced to soften the transition
for addons out there which have been doing this in a lazy/lax way so far.


Now, what may be slightly confusing are the "fallback" measures in place:
* "Scene" - To ensure that loading old files goes ok without needing a version patch,
if the active object has GPencil data, that will be used in place of the scene's
own GPencil data.
* "Object" - If there was no active object at the time of creating strokes
(for instance, if you delete the active object immediately before drawing),
GPencil data gets attached to the current scene instead.

Since some tweaks may still be needed here, I've decided to bump the subversion
number so that we have a reference point when doing version patches.