[Bf-blender-cvs] [c96cfbb196e] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: c96cfbb196ee1a6e3b43bfe34699fad7d5b0b017
Author: Antonio Vazquez
Date:   Thu May 18 20:06:37 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc96cfbb196ee1a6e3b43bfe34699fad7d5b0b017

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index bb2a7550f4b,99b42bf22dc..10bd5ad0850
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3124,48 -3128,20 +3125,7 @@@ class VIEW3D_MT_edit_gpencil_interpolat
  
  # ********** Panel **********
  
 -class VIEW3D_PT_grease_pencil(GreasePencilDataPanel, Panel):
 -    bl_space_type = 'VIEW_3D'
 -    bl_region_type = 'UI'
 -
 -    # NOTE: this is just a wrapper around the generic GP Panel
 -
 -
 -class VIEW3D_PT_grease_pencil_palettecolor(GreasePencilPaletteColorPanel, Panel):
 -    bl_space_type = 'VIEW_3D'
 -    bl_region_type = 'UI'
 -
 -    # NOTE: this is just a wrapper around the generic GP Panel
 -
  
- class VIEW3D_PT_viewport_debug(Panel):
-     bl_space_type = 'VIEW_3D'
-     bl_region_type = 'UI'
-     bl_label = "Modern Viewport"
-     bl_options = {'DEFAULT_CLOSED'}
- 
-     @classmethod
-     def poll(cls, context):
-         view = context.space_data
-         return (view)
- 
-     def draw_header(self, context):
-         view = context.space_data
-         self.layout.prop(view, "use_modern_viewport", text="")
- 
-     def draw(self, context):
-         layout = self.layout
-         view = context.space_data
- 
-         layout.active = view.use_modern_viewport
- 
-         col = layout.column()
-         col.label(text="Placeholder for debugging options")
-         col.separator()
- 
-         row = col.row()
-         row.active = not view.show_combined_depth
-         row.prop(view, "show_scene_depth")
-         row = col.row()
-         row.active = not view.show_scene_depth
-         row.prop(view, "show_combined_depth")
- 
-         row = col.row(align=True)
-         row.active = view.show_scene_depth or view.show_combined_depth
-         row.prop(view, "debug_near")
-         row.prop(view, "debug_far")
- 
-         col.label(text="Background:")
-         col.row(align=True).prop(view, "debug_background", expand=True)
- 
- 
  class VIEW3D_PT_view3d_properties(Panel):
      bl_space_type = 'VIEW_3D'
      bl_region_type = 'UI'
@@@ -3926,7 -3847,8 +3831,6 @@@ classes = 
      VIEW3D_MT_edit_armature_delete,
      VIEW3D_MT_edit_gpencil_transform,
      VIEW3D_MT_edit_gpencil_interpolate,
-     VIEW3D_PT_viewport_debug,
 -    VIEW3D_PT_grease_pencil,
 -    VIEW3D_PT_grease_pencil_palettecolor,
      VIEW3D_PT_view3d_properties,
      VIEW3D_PT_view3d_cursor,
      VIEW3D_PT_view3d_name,
diff --cc source/blender/gpu/GPU_shader.h
index e5195b44326,05949d759a4..8241f0060a0
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@@ -167,10 -167,10 +167,13 @@@ typedef enum GPUBuiltinShader 
  	GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE, /* Uniformly scaled */
  	GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SCALE,
  	GPU_SHADER_INSTANCE_EDGES_VARIYING_COLOR,
 +	/* grease pencil drawing */
 +	GPU_SHADER_GPENCIL_STROKE,
 +	GPU_SHADER_GPENCIL_FILL,
  
+ 	GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_SOLID,
+ 	GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE,
+ 
  	GPU_NUM_BUILTIN_SHADERS /* (not an actual shader) */
  } GPUBuiltinShader;
  
diff --cc source/blender/gpu/intern/gpu_shader.c
index c4e59ac1806,e9012702ff7..d8cb32e2946
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -794,12 -789,10 +796,17 @@@ GPUShader *GPU_shader_get_builtin_shade
  		                                               datatoc_gpu_shader_flat_color_frag_glsl,
  		                                               datatoc_gpu_shader_instance_edges_variying_color_geom_glsl},
  
+ 		[GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_SOLID] = { datatoc_gpu_shader_instance_bone_envelope_solid_vert_glsl,
+ 		                                           datatoc_gpu_shader_simple_lighting_frag_glsl },
+ 		[GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE] = { datatoc_gpu_shader_instance_bone_envelope_wire_vert_glsl,
+ 		                                                datatoc_gpu_shader_flat_color_frag_glsl },
++
 +		[GPU_SHADER_GPENCIL_STROKE] = { datatoc_gpu_shader_gpencil_stroke_vert_glsl,
 +									    datatoc_gpu_shader_gpencil_stroke_frag_glsl,
 +			                            datatoc_gpu_shader_gpencil_stroke_geom_glsl },
 +
 +		[GPU_SHADER_GPENCIL_FILL] = { datatoc_gpu_shader_gpencil_fill_vert_glsl,
 +		                              datatoc_gpu_shader_gpencil_fill_frag_glsl },
  	};
  
  	if (builtin_shaders[shader] == NULL) {