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

Joshua Leung noreply at git.blender.org
Wed May 9 15:23:21 CEST 2018


Commit: 8e4604949c707e3323fb4a43f5bd4275c624a16e
Author: Joshua Leung
Date:   Wed May 9 15:23:15 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8e4604949c707e3323fb4a43f5bd4275c624a16e

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 14c3c85d0cf,5a753ffe159..906de39adf7
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -283,24 -278,8 +283,24 @@@ data_to_c_simple(modes/shaders/paint_wi
  data_to_c_simple(modes/shaders/paint_wire_vert.glsl SRC)
  data_to_c_simple(modes/shaders/paint_vert_frag.glsl SRC)
  data_to_c_simple(modes/shaders/particle_strand_frag.glsl SRC)
- data_to_c_simple(modes/shaders/particle_vert.glsl SRC)
+ data_to_c_simple(modes/shaders/particle_strand_vert.glsl SRC)
  
 +data_to_c_simple(engines/gpencil/shaders/gpencil_fill_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_fill_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_simple_mix_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_point_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_point_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_point_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_painting_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_paper_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_edit_point_frag.glsl SRC)
 +
  list(APPEND INC
  )
  
diff --cc source/blender/makesdna/DNA_object_types.h
index c58b9c87945,5139e54b577..7c3b4a54e34
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -364,15 -372,18 +372,20 @@@ enum 
  
  /* 23 and 24 are for life and sector (old file compat.) */
  	OB_ARMATURE   = 25,
 +/* Grease Pencil object used in 3D view but not used for annotation in 2D */
 +	OB_GPENCIL  = 26,
  };
  
+ /* ObjectDisplay.flag */
+ enum {
+ 	OB_SHOW_SHADOW = (1 << 0),
+ };
+ 
  /* check if the object type supports materials */
  #define OB_TYPE_SUPPORT_MATERIAL(_type) \
 -	((_type) >= OB_MESH && (_type) <= OB_MBALL)
 +	(((_type) >= OB_MESH && (_type) <= OB_MBALL) || ((_type) == OB_GPENCIL))
  #define OB_TYPE_SUPPORT_VGROUP(_type) \
 -	(ELEM(_type, OB_MESH, OB_LATTICE))
 +	(ELEM(_type, OB_MESH, OB_LATTICE, OB_GPENCIL))
  #define OB_TYPE_SUPPORT_EDITMODE(_type) \
  	(ELEM(_type, OB_MESH, OB_FONT, OB_CURVE, OB_SURF, OB_MBALL, OB_LATTICE, OB_ARMATURE))
  #define OB_TYPE_SUPPORT_PARVERT(_type) \



More information about the Bf-blender-cvs mailing list