[Bf-blender-cvs] [dacfa8fb23f] soc-2021-simulation-display: Merge branch 'master' into soc-2021-simulation-display

[soumya pochiraju]

Commit: dacfa8fb23f01952105130026116e8400ca7d974
Author: soumya pochiraju
Date:   Tue Sep 14 16:24:18 2021 +0530
Branches: soc-2021-simulation-display
https://developer.blender.org/rBdacfa8fb23f01952105130026116e8400ca7d974

Merge branch 'master' into soc-2021-simulation-display

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 3d1e53c15fd,71115c5ceb9..136c7394498
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -448,7 -447,7 +448,8 @@@ data_to_c_simple(engines/overlay/shader
  data_to_c_simple(engines/overlay/shaders/extra_wire_vert.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/facing_frag.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/facing_vert.glsl SRC)
 +data_to_c_simple(engines/overlay/shaders/vector_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/grid_background_frag.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/grid_frag.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/grid_vert.glsl SRC)
  data_to_c_simple(engines/overlay/shaders/image_vert.glsl SRC)
diff --cc source/blender/draw/engines/overlay/overlay_shader.c
index 4d1e7a72a10,389704b3d66..1c541e4c081
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@@ -92,7 -91,7 +92,8 @@@ extern char datatoc_extra_wire_frag_gls
  extern char datatoc_extra_wire_vert_glsl[];
  extern char datatoc_facing_frag_glsl[];
  extern char datatoc_facing_vert_glsl[];
 +extern char datatoc_vector_vert_glsl[];
+ extern char datatoc_grid_background_frag_glsl[];
  extern char datatoc_grid_frag_glsl[];
  extern char datatoc_grid_vert_glsl[];
  extern char datatoc_image_frag_glsl[];
@@@ -199,9 -197,9 +200,10 @@@ typedef struct OVERLAY_Shaders 
    GPUShader *extra_lightprobe_grid;
    GPUShader *extra_loose_point;
    GPUShader *facing;
 +  GPUShader *force_vector;
    GPUShader *gpencil_canvas;
    GPUShader *grid;
+   GPUShader *grid_background;
    GPUShader *grid_image;
    GPUShader *image;
    GPUShader *motion_path_line;
diff --cc source/blender/draw/intern/draw_cache.h
index 706c00cf328,5863ada2ccf..653b4af5d3a
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@@ -266,7 -254,6 +256,8 @@@ struct GPUBatch *DRW_cache_gpencil_face
  struct bGPDstroke *DRW_cache_gpencil_sbuffer_stroke_data_get(struct Object *ob);
  void DRW_cache_gpencil_sbuffer_clear(struct Object *ob);
  
 +/* Non primitive collision shapes */
 +struct GPUBatch *DRW_cache_non_primitive_col_shape_get(Object *ob);
- void DRW_cache_non_primitive_col_shape_free(Object *ob);
- void DRW_cache_non_primitive_col_shape_store_ob(Object *ob);
+ #ifdef __cplusplus
+ }
+ #endif