[Bf-blender-cvs] [99c3d1106e3] soc-2016-uv_tools: Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

[Phil Gosch]

Commit: 99c3d1106e3ff73e2111781d8e38307b2164d57c
Author: Phil Gosch
Date:   Tue Jul 11 19:51:35 2017 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rB99c3d1106e3ff73e2111781d8e38307b2164d57c

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_operators/uvcalc_follow_active.py
index ffabf368589,25ee5cafe81..7a4a1bc3601
--- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py
+++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py
@@@ -250,3 -248,8 +250,8 @@@ class FollowActiveQuads(Operator)
      def invoke(self, context, event):
          wm = context.window_manager
          return wm.invoke_props_dialog(self)
+ 
+ 
+ classes = (
+     FollowActiveQuads,
 -)
++)
diff --cc release/scripts/startup/bl_operators/uvcalc_lightmap.py
index bae0bd3a2b7,8ee29d15d1b..173fe823b50
--- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py
+++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
@@@ -670,3 -668,8 +670,8 @@@ class LightMapPack(Operator)
      def invoke(self, context, event):
          wm = context.window_manager
          return wm.invoke_props_dialog(self)
+ 
+ 
+ classes = (
+     LightMapPack,
 -)
++)