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

Antonio Vazquez noreply at git.blender.org
Fri Jun 29 09:55:21 CEST 2018


Commit: f88f2b73c0ed01f3447e834780c443ec6940d356
Author: Antonio Vazquez
Date:   Fri Jun 29 09:55:11 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf88f2b73c0ed01f3447e834780c443ec6940d356

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/include/ED_datafiles.h
index a47d805fddd,7d509d1243a..475ceccbcc2
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@@ -239,67 -239,6 +239,66 @@@ extern char datatoc_mc23_jpg[]
  extern int datatoc_mc24_jpg_size;
  extern char datatoc_mc24_jpg[];
  
 +/* grease pencil sculpt brushes files */
  
 +extern int datatoc_gp_brush_smooth_png_size;
 +extern char datatoc_gp_brush_smooth_png[];
 +
 +extern int datatoc_gp_brush_thickness_png_size;
 +extern char datatoc_gp_brush_thickness_png[];
 +
 +extern int datatoc_gp_brush_strength_png_size;
 +extern char datatoc_gp_brush_strength_png[];
 +
 +extern int datatoc_gp_brush_grab_png_size;
 +extern char datatoc_gp_brush_grab_png[];
 +
 +extern int datatoc_gp_brush_push_png_size;
 +extern char datatoc_gp_brush_push_png[];
 +
 +extern int datatoc_gp_brush_twist_png_size;
 +extern char datatoc_gp_brush_twist_png[];
 +
 +extern int datatoc_gp_brush_pinch_png_size;
 +extern char datatoc_gp_brush_pinch_png[];
 +
 +extern int datatoc_gp_brush_randomize_png_size;
 +extern char datatoc_gp_brush_randomize_png[];
 +
 +extern int datatoc_gp_brush_clone_png_size;
 +extern char datatoc_gp_brush_clone_png[];
 +
 +extern int datatoc_gp_brush_weight_png_size;
 +extern char datatoc_gp_brush_weight_png[];
 +
 +extern int datatoc_gp_brush_pencil_png_size;
 +extern char datatoc_gp_brush_pencil_png[];
 +
 +extern int datatoc_gp_brush_pen_png_size;
 +extern char datatoc_gp_brush_pen_png[];
 +
 +extern int datatoc_gp_brush_ink_png_size;
 +extern char datatoc_gp_brush_ink_png[];
 +
 +extern int datatoc_gp_brush_inknoise_png_size;
 +extern char datatoc_gp_brush_inknoise_png[];
 +
 +extern int datatoc_gp_brush_block_png_size;
 +extern char datatoc_gp_brush_block_png[];
 +
 +extern int datatoc_gp_brush_marker_png_size;
 +extern char datatoc_gp_brush_marker_png[];
 +
 +extern int datatoc_gp_brush_fill_png_size;
 +extern char datatoc_gp_brush_fill_png[];
 +
 +extern int datatoc_gp_brush_erase_soft_png_size;
 +extern char datatoc_gp_brush_erase_soft_png[];
 +
 +extern int datatoc_gp_brush_erase_hard_png_size;
 +extern char datatoc_gp_brush_erase_hard_png[];
 +
 +extern int datatoc_gp_brush_erase_stroke_png_size;
 +extern char datatoc_gp_brush_erase_stroke_png[];
  
  #endif /* __ED_DATAFILES_H__ */
- 
diff --cc source/blender/makesdna/DNA_material_types.h
index 2050bd71884,eb469895fd7..50d9b890724
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@@ -285,25 -229,4 +285,24 @@@ enum 
  	MA_BS_HASHED,
  };
  
 +/* Grease Pencil Stroke styles */
 +enum {
 +	GP_STYLE_STROKE_STYLE_SOLID = 0,
 +	GP_STYLE_STROKE_STYLE_TEXTURE
 +};
 +
 +/* Grease Pencil Fill styles */
 +enum {
 +	GP_STYLE_FILL_STYLE_SOLID = 0,
 +	GP_STYLE_FILL_STYLE_GRADIENT,
 +	GP_STYLE_FILL_STYLE_CHESSBOARD,
 +	GP_STYLE_FILL_STYLE_TEXTURE
 +};
 +
 +/* Grease Pencil Gradient Types */
 +enum {
 +	GP_STYLE_GRADIENT_LINEAR = 0,
 +	GP_STYLE_GRADIENT_RADIAL
 +};
 +
  #endif
-



More information about the Bf-blender-cvs mailing list