Blender Git Commits

Merge from trunk r49908-r50219

Scons:
* Fix scons compilation, by moving some arguments to the second argument list.

svn merge ^/trunk/blender -r50097:50211

minor changes needed for building with smoke disabled

Bridge, add n-gon optimization
Bevel, fix error in calculating profile.

svn merge ^/trunk/blender -r49776:50097

svn merge ^/trunk/blender -r50064:50096

svn merge ^/trunk/blender -r50010:50095

svn merge ^/trunk/blender -r50014:50094

"Pens Down" merge /w trunk r49015-r50064. Make clean patches for Google Summer of Code against trunk revision 50064.

Note: The new flag LIB_LOAD_ASYNC in the GE conflicted with trunks new LIB_LOAD_SCRIPTS, so I changed the value of ASYNC. So, heads up if these values has been saved in any .blend files!

Once again (see last merge note) it seems like node_draw.c had a bunch of wierd conflicts that make it look like it missed a merge or update. Not sure what is going on with that file.

Other parts of the merge had some difficulty resolving proper bracket nesting in places where it seems like the merge should have gone smoothly. Maybe that was KDiff3's fault? This reduces my confidence on if bugs were not introduced.

Added file view3d_composite.c to be the home of a small API needed to do complex GPUaspectfuncs that involve combining multiple layers.

The file is empty right now, but I wanted to include it before doing a merge in preparation for submitting the patch for the end of GSoC.

Parallel, and Planar snapping implemented, along with some fairly major
work on SnapSystem. More to come in the comming weeks!
GSOC 2012 Precision Modelling tools

- bf_fbx: cleanup import defaults, fix typos and UI descriptions.

Some texture fixes and Clean up for GLES/GLSL

- bf_assimp, bf_fbx: make assimp and fbx import settings accessible from the UI / add them to SRNA.

Added missing gpuImmediateFormat/gpuImmediateUnformat for knife tool and proportional edit

- bf_fbx: expose more of assimp's fbx import settings to Blender.

Code cleanup

fixed warning about const qualifier on function parameter

Added missing gpuImmediateFormat/gpuImmediateUnformat for loopcut visualization.