Blender Git Commits

Merge branch 'master' into soc-2017-normal-tools

Merge branch 'master' into soc-2017-normal-tools

More rampaging cleanup & refactor in new clnor editmesh/transform code.

Also added loop_index to TransDataLoopNormal mapping, which allows us to
avoid another nasty loop-in-loop case.

Fix bug with transform_ui helper.

Fix/cleanup BM_lnorspace_invalidate().

This func can be made much nicer now that we store BMLoop pointers.

LNorSpaceArray: Ease access to loop in BMesh context.

Unlike 'regular' mesh, BMesh makes it really hard to get a BMLoop from
its index - it's designed to work in reverse, with passing BMLoop
pointers around, not their indices.

Henceforce, changed MLoopNorSpaceArray to support two kind of loop
storage, either indices (when used with regular Mesh), or BMLoop
pointers themselves (when used with BMesh).

Changes are luckily fairly simple and straightforward, so would not
expect too much issues here (quick tests seem to be all OK), and this
makes handling of clnors in BMesh context much eaiser (avoiding some
mapping or double-looping to get loops from their indices...).

For same reason, also added BMLoop pointer itself in TransDataLoopNormal struct.

There's still some (new) code to adjust/simplify, will be done in next
commits.

More cleanup...

Move WeightedNormal modifier together with NormalEdit one in menu.

Though this breaks alphabetical order, it makes much more sense to have
those two together...

More cleanup...

More style cleanup, renaming some now-public functions.

Tweaks to UI.

Fix missing break in switch block.

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
source/blender/makesrna/intern/rna_scene.c

Cleanup: better names for new clnor edit operators enums.

Even if those remain local to the file, better have not to use too much
generic names, this can easily backfire in future.

Fix bad UI-related code in action callbacks of operators.

UI/drawing related code in action callbacks is really not nice,
especially since we do have a more consistent way to dynamically
show/hide some properties.

Note that transform_ops one remains rather hackish here (since we have
to use context for this case)... Not sure how to do it better so far.

Fix missing new weighted normals modifier case in Outliners' drawing code.

Fix some build warnings in new weighted normals modifier code.

Cleanup (no functional change expected).

Mostly styling, and some minor/harmless errors.

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
intern/cycles/device/device.cpp

Fix T53040: Vertex paint, texure & symmetry fail

Removed old logic for brush texture which was being applied twice.