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

[Phil Gosch]

Commit: 2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33
Author: Phil Gosch
Date:   Fri Sep 29 22:52:29 2017 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rB2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33

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

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



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

diff --cc release/scripts/startup/bl_operators/uvcalc_smart_project.py
index d9a4afea5cc,cc590ac9502..0ae600c8046
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@@ -747,10 -747,9 +747,10 @@@ def main(context
      USER_FILL_HOLES = 0
      USER_FILL_HOLES_QUALITY = 50 # Only for hole filling.
      USER_VIEW_INIT = 0 # Only for hole filling.
-     
+ 
      is_editmode = (context.active_object.mode == 'EDIT')
      if is_editmode:
 +        bpy.ops.uv.reveal()
          obList =  [ob for ob in [context.active_object] if ob and ob.type == 'MESH']
      else:
          obList =  [ob for ob in context.selected_editable_objects if ob and ob.type == 'MESH']