Merge branch 'blender-v2.83-release'

# Conflicts:
#	source/blender/draw/engines/eevee/eevee_volumes.c

8 files changed, 100 insertions, 13 deletions

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 1d0a62fd7b5..b75592836e0 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3306,6 +3306,16 @@ static Mesh *create_liquid_geometry(FluidDomainSettings *mds, Mesh *orgmesh, Obj
   /* Biggest dimension will be used for upscaling. */
   float max_size = MAX3(size[0], size[1], size[2]);
 
+  float co_scale[3];
+  co_scale[0] = max_size / ob->scale[0];
+  co_scale[1] = max_size / ob->scale[1];
+  co_scale[2] = max_size / ob->scale[2];
+
+  float co_offset[3];
+  co_offset[0] = (mds->p0[0] + mds->p1[0]) / 2.0f;
+  co_offset[1] = (mds->p0[1] + mds->p1[1]) / 2.0f;
+  co_offset[2] = (mds->p0[2] + mds->p1[2]) / 2.0f;
+
   /* Normals. */
   normals = MEM_callocN(sizeof(short) * num_normals * 3, "Fluidmesh_tmp_normals");
 
@@ -3329,9 +3339,9 @@ static Mesh *create_liquid_geometry(FluidDomainSettings *mds, Mesh *orgmesh, Obj
       mverts->co[2] *= mds->dx / mds->mesh_scale;
     }
 
-    mverts->co[0] *= max_size / fabsf(ob->scale[0]);
-    mverts->co[1] *= max_size / fabsf(ob->scale[1]);
-    mverts->co[2] *= max_size / fabsf(ob->scale[2]);
+    mul_v3_v3(mverts->co, co_scale);
+    add_v3_v3(mverts->co, co_offset);
+
 #  ifdef DEBUG_PRINT
     /* Debugging: Print coordinates of vertices. */
     printf("mverts->co[0]: %f, mverts->co[1]: %f, mverts->co[2]: %f\n",
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 6bd841ca8e5..3e4118ee601 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3887,6 +3887,10 @@ bool BKE_object_is_child_recursive(const Object *ob_parent, const Object *ob_chi
  * cases false positives are hard to avoid (shape keys for example) */
 int BKE_object_is_modified(Scene *scene, Object *ob)
 {
+  /* Always test on original object since evaluated object may no longer
+   * have shape keys or modifiers that were used to evaluate it. */
+  ob = DEG_get_original_object(ob);
+
   int flag = 0;
 
   if (BKE_key_from_object(ob)) {
@@ -4017,6 +4021,10 @@ static bool modifiers_has_animation_check(const Object *ob)
  * and we can still if there was actual deformation afterwards */
 int BKE_object_is_deform_modified(Scene *scene, Object *ob)
 {
+  /* Always test on original object since evaluated object may no longer
+   * have shape keys or modifiers that were used to evaluate it. */
+  ob = DEG_get_original_object(ob);
+
   ModifierData *md;
   VirtualModifierData virtualModifierData;
   int flag = 0;
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index ad90c52b08e..83bd4fcf8d2 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -486,8 +486,7 @@ static bool eevee_volume_object_mesh_init(Scene *scene,
   ModifierData *md = NULL;
 
   /* Smoke Simulation */
-  if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
-      (md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) &&
+  if ((md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) &&
       (BKE_modifier_is_enabled(scene, md, eModifierMode_Realtime)) &&
       ((FluidModifierData *)md)->domain != NULL) {
     FluidModifierData *mmd = (FluidModifierData *)md;
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
index 8c2032f834a..d81c6f4fe0b 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
@@ -99,8 +99,10 @@ void main()
     discard;
   }
 
+  vec2 fb_size = max(vec2(textureSize(gpSceneDepthTexture, 0).xy),
+                     vec2(textureSize(gpMaskTexture, 0).xy));
+  vec2 uvs = gl_FragCoord.xy / fb_size;
   /* Manual depth test */
-  vec2 uvs = gl_FragCoord.xy / vec2(textureSize(gpSceneDepthTexture, 0).xy);
   float scene_depth = texture(gpSceneDepthTexture, uvs).r;
   if (gl_FragCoord.z > scene_depth) {
     discard;
diff --git a/source/blender/draw/engines/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h
index 0c29fe9d2e4..257cf777ed2 100644
--- a/source/blender/draw/engines/overlay/overlay_private.h
+++ b/source/blender/draw/engines/overlay/overlay_private.h
@@ -253,8 +253,9 @@ typedef struct OVERLAY_PrivateData {
   DRWShadingGroup *particle_shapes_grp;
   DRWShadingGroup *pointcloud_dots_grp;
   DRWShadingGroup *sculpt_mask_grp;
-  DRWShadingGroup *wires_grp[2][2];     /* With and without coloring. */
-  DRWShadingGroup *wires_all_grp[2][2]; /* With and without coloring. */
+  DRWShadingGroup *wires_grp[2][2];      /* With and without coloring. */
+  DRWShadingGroup *wires_all_grp[2][2];  /* With and without coloring. */
+  DRWShadingGroup *wires_hair_grp[2][2]; /* With and without coloring. */
   DRWShadingGroup *wires_sculpt_grp[2];
 
   DRWView *view_default;
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c
index 99ff7f67d49..309c7c1021a 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.c
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.c
@@ -21,15 +21,18 @@
  */
 
 #include "DNA_mesh_types.h"
+#include "DNA_particle_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_volume_types.h"
 
 #include "BKE_curve.h"
 #include "BKE_displist.h"
+#include "BKE_duplilist.h"
 #include "BKE_editmesh.h"
 #include "BKE_global.h"
 #include "BKE_object.h"
 #include "BKE_paint.h"
+#include "BKE_particle.h"
 
 #include "BLI_hash.h"
 
@@ -95,16 +98,24 @@ void OVERLAY_wireframe_cache_init(OVERLAY_Data *vedata)
       DRW_shgroup_uniform_bool_copy(grp, "isTransform", (G.moving & G_TRANSFORM_OBJ) != 0);
       DRW_shgroup_uniform_bool_copy(grp, "isObjectColor", is_object_color);
       DRW_shgroup_uniform_bool_copy(grp, "isRandomColor", is_random_color);
+      DRW_shgroup_uniform_bool_copy(grp, "isHair", false);
 
       pd->wires_all_grp[xray][use_coloring] = grp = DRW_shgroup_create(wires_sh, pass);
       DRW_shgroup_uniform_texture_ref(grp, "depthTex", depth_tx);
       DRW_shgroup_uniform_float_copy(grp, "wireStepParam", 1.0f);
+
+      pd->wires_hair_grp[xray][use_coloring] = grp = DRW_shgroup_create(wires_sh, pass);
+      /* TODO(fclem) texture ref persist */
+      DRW_shgroup_uniform_texture_ref(grp, "depthTex", depth_tx);
+      DRW_shgroup_uniform_bool_copy(grp, "isHair", true);
+      DRW_shgroup_uniform_float_copy(grp, "wireStepParam", 10.0f);
     }
 
     pd->wires_sculpt_grp[xray] = grp = DRW_shgroup_create(wires_sh, pass);
     DRW_shgroup_uniform_texture_ref(grp, "depthTex", depth_tx);
     DRW_shgroup_uniform_float_copy(grp, "wireStepParam", 10.0f);
     DRW_shgroup_uniform_bool_copy(grp, "useColoring", false);
+    DRW_shgroup_uniform_bool_copy(grp, "isHair", false);
   }
 
   if (is_material_shmode) {
@@ -112,19 +123,53 @@ void OVERLAY_wireframe_cache_init(OVERLAY_Data *vedata)
     for (int use_coloring = 0; use_coloring < 2; use_coloring++) {
       pd->wires_grp[1][use_coloring] = pd->wires_grp[0][use_coloring];
       pd->wires_all_grp[1][use_coloring] = pd->wires_all_grp[0][use_coloring];
+      pd->wires_hair_grp[1][use_coloring] = pd->wires_hair_grp[0][use_coloring];
     }
     pd->wires_sculpt_grp[1] = pd->wires_sculpt_grp[0];
     psl->wireframe_xray_ps = NULL;
   }
 }
 
+static void wireframe_hair_cache_populate(OVERLAY_Data *vedata, Object *ob, ParticleSystem *psys)
+{
+  OVERLAY_PrivateData *pd = vedata->stl->pd;
+  const bool is_xray = (ob->dtx & OB_DRAWXRAY) != 0;
+
+  Object *dupli_parent = DRW_object_get_dupli_parent(ob);
+  DupliObject *dupli_object = DRW_object_get_dupli(ob);
+
+  float dupli_mat[4][4];
+  if ((dupli_parent != NULL) && (dupli_object != NULL)) {
+    if (dupli_object->type & OB_DUPLICOLLECTION) {
+      copy_m4_m4(dupli_mat, dupli_parent->obmat);
+    }
+    else {
+      copy_m4_m4(dupli_mat, dupli_object->ob->obmat);
+      invert_m4(dupli_mat);
+      mul_m4_m4m4(dupli_mat, ob->obmat, dupli_mat);
+    }
+  }
+  else {
+    unit_m4(dupli_mat);
+  }
+
+  struct GPUBatch *hairs = DRW_cache_particles_get_hair(ob, psys, NULL);
+
+  const bool use_coloring = true;
+  DRWShadingGroup *shgrp = DRW_shgroup_create_sub(pd->wires_hair_grp[is_xray][use_coloring]);
+  DRW_shgroup_uniform_vec4_copy(shgrp, "hairDupliMatrix[0]", dupli_mat[0]);
+  DRW_shgroup_uniform_vec4_copy(shgrp, "hairDupliMatrix[1]", dupli_mat[1]);
+  DRW_shgroup_uniform_vec4_copy(shgrp, "hairDupliMatrix[2]", dupli_mat[2]);
+  DRW_shgroup_uniform_vec4_copy(shgrp, "hairDupliMatrix[3]", dupli_mat[3]);
+  DRW_shgroup_call_no_cull(shgrp, hairs, ob);
+}
+
 void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
                                       Object *ob,
                                       OVERLAY_DupliData *dupli,
                                       bool init_dupli)
 {
-  OVERLAY_Data *data = vedata;
-  OVERLAY_PrivateData *pd = data->stl->pd;
+  OVERLAY_PrivateData *pd = vedata->stl->pd;
   const DRWContextState *draw_ctx = DRW_context_state_get();
   const bool all_wires = (ob->dtx & OB_DRAW_ALL_EDGES) != 0;
   const bool is_xray = (ob->dtx & OB_DRAWXRAY) != 0;
@@ -134,6 +179,19 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
   const bool use_wire = !is_mesh_verts_only && ((pd->overlay.flag & V3D_OVERLAY_WIREFRAMES) ||
                                                 (ob->dtx & OB_DRAWWIRE) || (ob->dt == OB_WIRE));
 
+  if (use_wire && pd->wireframe_mode && ob->particlesystem.first) {
+    for (ParticleSystem *psys = ob->particlesystem.first; psys != NULL; psys = psys->next) {
+      if (!DRW_object_is_visible_psys_in_active_context(ob, psys)) {
+        continue;
+      }
+      ParticleSettings *part = psys->part;
+      const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
+      if (draw_as == PART_DRAW_PATH) {
+        wireframe_hair_cache_populate(vedata, ob, psys);
+      }
+    }
+  }
+
   if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) {
     OVERLAY_ExtraCallBuffers *cb = OVERLAY_extra_call_buffer_get(vedata, ob);
     float *color;
diff --git a/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl b/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
index 7e71f4ae587..f7467aa3bf4 100644
--- a/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
@@ -4,6 +4,8 @@ uniform bool useColoring;
 uniform bool isTransform;
 uniform bool isObjectColor;
 uniform bool isRandomColor;
+uniform bool isHair;
+uniform vec4 hairDupliMatrix[4];
 
 in vec3 pos;
 in vec3 nor;
@@ -103,9 +105,16 @@ void main()
 {
   bool no_attr = all(equal(nor, vec3(0)));
   vec3 wnor = no_attr ? ViewMatrixInverse[2].xyz : normalize(normal_object_to_world(nor));
-
   vec3 wpos = point_object_to_world(pos);
 
+  if (isHair) {
+    mat4 obmat = mat4(
+        hairDupliMatrix[0], hairDupliMatrix[1], hairDupliMatrix[2], hairDupliMatrix[3]);
+
+    wpos = (obmat * vec4(pos, 1.0)).xyz;
+    wnor = -normalize(mat3(obmat) * nor);
+  }
+
   bool is_persp = (ProjectionMatrix[3][3] == 0.0);
   vec3 V = (is_persp) ? normalize(ViewMatrixInverse[3].xyz - wpos) : ViewMatrixInverse[2].xyz;
 
diff --git a/source/blender/editors/interface/view2d_draw.c b/source/blender/editors/interface/view2d_draw.c
index 95fec2a10e9..36213f919a3 100644
--- a/source/blender/editors/interface/view2d_draw.c
+++ b/source/blender/editors/interface/view2d_draw.c
@@ -203,9 +203,9 @@ static void draw_parallel_lines(const ParallelLinesSet *lines,
 
     immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
     immUniform2fv("viewportSize", &viewport[2]);
-    /* 0.5f factor here  is because the line is too fat due to the builtin antialiasing.
+    /* -1.0f offset here  is because the line is too fat due to the builtin antialiasing.
      * TODO make a variant or a uniform to toggle it off. */
-    immUniform1f("lineWidth", 0.5f * U.pixelsize);
+    immUniform1f("lineWidth", U.pixelsize - 1.0f);
   }
   else {
     immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);