[Bf-blender-cvs] [5c22c1f90c9] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 5c22c1f90c9e81ce7f657ef2bd3ce6fb730c22af
Author: Antonio Vazquez
Date:   Mon Sep 2 13:40:50 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5c22c1f90c9e81ce7f657ef2bd3ce6fb730c22af

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_data_modifier.py
	source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c

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



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

diff --cc release/scripts/startup/bl_ui/properties_data_modifier.py
index cec2f696005,dcdb1e22bde..a98ecf848e1
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@@ -1783,7 -1783,7 +1783,7 @@@ class DATA_PT_gpencil_modifiers(Modifie
  
          col.label(text="Material:")
          row = col.row(align=True)
--        
++
          row.prop_search(md, "material", gpd, "materials", text="", icon='SHADING_TEXTURE')
          row.prop(md, "invert_materials", text="", icon='ARROW_LEFTRIGHT')
          row = layout.row(align=True)
@@@ -2333,38 -2333,7 +2333,38 @@@
          sub = row.row(align=True)
          sub.active = bool(md.vertex_group)
          sub.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
-         
+ 
 +    def GP_LENGTH(self, layout, ob, md):
 +        sp = layout.split()
 +        col = sp.column()
 +        col.label(text="Absolute:")
 +        col.prop(md, "length")
 +
 +        col = sp.column()
 +        col.label(text="Relative:")
 +        col.prop(md, "percentage")
-     
++
 +    def GP_MULTIPLY(self, layout, ob, md):
 +        sp = layout.split(factor = 0.5)
 +
 +        col = sp.column()
 +        col.prop(md, "enable_duplication")
 +        if md.enable_duplication:
 +            col.prop(md,"duplications")
 +            col.prop(md,"distance")
 +            col.prop(md,"offset", slider=True)
-         
++
 +            col.prop(md,"enable_fading")
 +            if md.enable_fading:
 +                col.prop(md, "fading_center")
 +                c = col.column(align = True)
 +                c.prop(md, "fading_thickness", slider=True)
 +                c.prop(md, "fading_opacity", slider=True)
 +
 +        col = sp.column()
 +        col.prop(md, "enable_angle_splitting")
 +        if md.enable_angle_splitting:
 +            col.prop(md,"split_angle")
  
  classes = (
      DATA_PT_modifiers,