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

[Phil Gosch]

Commit: d49a667707574134bc74c2e00325e9d30214b8c1
Author: Phil Gosch
Date:   Fri Jan 27 08:58:44 2017 +0100
Branches: soc-2016-uv_tools
https://developer.blender.org/rBd49a667707574134bc74c2e00325e9d30214b8c1

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

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



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

diff --cc release/scripts/startup/bl_ui/space_image.py
index f4df6091b5,04b4cef951..2baa58d4bf
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@@ -267,17 -258,21 +267,31 @@@ class IMAGE_MT_uvs_showhide(Menu)
          layout.operator("uv.hide", text="Hide Selected").unselected = False
          layout.operator("uv.hide", text="Hide Unselected").unselected = True
  
 +class IMAGE_MT_uvs_deselect_mesh(Menu):
 +    bl_label = "De/Select 3D Mesh"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        layout.operator("uv.select_mesh")
 +        layout.operator("uv.deselect_mesh", text="Deselect 3D Mesh (Selected)").unselected = False
 +        layout.operator("uv.deselect_mesh", text="Deselect 3D Mesh (Unselected)").unselected = True
 +
  
+ class IMAGE_MT_uvs_proportional(Menu):
+     bl_label = "Proportional Editing"
+ 
+     def draw(self, context):
+         layout = self.layout
+ 
+         layout.props_enum(context.tool_settings, "proportional_edit")
+ 
+         layout.separator()
+ 
+         layout.label("Falloff:")
+         layout.props_enum(context.tool_settings, "proportional_edit_falloff")
+ 
+ 
  class IMAGE_MT_uvs_transform(Menu):
      bl_label = "Transform"
  
diff --cc source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 3f8bf4cc65,d808000281..719b5c7892
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@@ -1675,10 -1258,8 +1675,10 @@@ void UV_OT_unwrap(wmOperatorType *ot
  	                "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry");
  	RNA_def_boolean(ot->srna, "correct_aspect", 1, "Correct Aspect",
  	                "Map UVs taking image aspect ratio into account");
 +	RNA_def_boolean(ot->srna, "pack_islands", 1, "Pack Islands",
 +					"Pack UV islands after unwrapping");
  	RNA_def_boolean(ot->srna, "use_subsurf_data", 0, "Use Subsurf Modifier",
- 	                "Map UVs taking vertex position after subsurf into account");
+ 	                "Map UVs taking vertex position after Subdivision Surface modifier has been applied");
  	RNA_def_float_factor(ot->srna, "margin", 0.001f, 0.0f, 1.0f, "Margin", "Space between islands", 0.0f, 1.0f);
  }