Blender Git Loki

Squashed commit of the following:

commit 5f4d6c97c8f0d8b5e35ec23167d6f35a628c052c
Author: Jonathan deWerd <[email protected]>
Date: Sat Sep 13 19:28:42 2014 -0400

Merge of soc-2014-NURBS: rhino import, analytic normals, trim support, uv trim editor, ux improvements.

Merge remote-tracking branch 'origin/master' into testbuild

Revert "Merge of SoC-NURBS: rhino import, analytic eval, trim support, uv trim editor, ux fixes."

This reverts commit 85a59690c092d7242fabd2164960a98f0661d3f8.

Merge of SoC-NURBS: rhino import, analytic eval, trim support, uv trim editor, ux fixes.

Merge branch 'master' into testbuild

Revert "D765: Blender input method editor support for windows (diff #7)."

This reverts commit 7816dfc782e3b46280001e837049b235903e6823.

D765: Blender input method editor support for windows (diff #7).

Revert "Squashed commit of the following:"

This reverts commit 108f25f33c06a74be37d6bd72d5dcc452b649f08.

Squashed commit of the following:

commit 5cc80f23ae5f7fd11ed026df2242ff3638d62c5d
Author: Jonathan deWerd <[email protected]>
Date: Sun Sep 7 01:55:48 2014 -0400

Merge of soc-2014-nurbs: rhino import, analytic eval, trim support, uv trim editor

commit da3be518b6c70aa06e5bb5db8ae78d1d6623a306
Author: Thomas Dinges <[email protected]>
Date: Sun Sep 7 21:13:00 2014 +0200

Comment out SVM fresnel_conductor() function for now, still unused.

Revert "Squashed commit of the following:"

This reverts commit ee3e0057af9656482308a7ebb0da7ada0b303055.

Squashed commit of the following:

commit 57c881f27a45c91af444f150d009a5c1f811d533
Author: Jonathan deWerd <[email protected]>
Date: Sun Sep 7 01:55:48 2014 -0400

Merge of soc-2014-nurbs: rhino import, analytic eval, trim support, uv trim editor

Merge branch 'master' into testbuild

Revert "Fix for buildbot compilation error in intern/ghost with SCons."

This reverts commit f2597abafd6c33b5a1cb887a37d06798a0af58e5.

Revert "Applied D765: Blender input method editor support for windows (diff #6)."

This reverts commit a78c75cab2166f8c93356ca6aa24378c6fdb5901.

Fix for buildbot compilation error in intern/ghost with SCons.

Applied D765: Blender input method editor support for windows (diff #6).

Revert "Squashed commit of the following:"

This reverts commit 3795f9f41b5dd8d19fd0137bd9f1f6ec75191331.

Squashed commit of the following:

commit 6ed88320f7c98cf7d7769500eaa0cec24b0328f3
Author: Jonathan deWerd <[email protected]>
Date: Sun Sep 7 01:55:48 2014 -0400

Merge of soc-2014-nurbs: rhino import, analytic eval, trim support, uv trim editor

Merge remote-tracking branch 'origin/master' into testbuild

Revert "Hair test."

This reverts commit f38173e58b54c87ab1b1821d63a273e3c1b83b2d.