Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite

1 files changed, 131 insertions, 71 deletions

diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c
index e17c6a00144..90761d24b73 100644
--- a/source/blender/blenkernel/intern/hair.c
+++ b/source/blender/blenkernel/intern/hair.c
@@ -22,6 +22,7 @@
 
 #include "DNA_defaults.h"
 #include "DNA_hair_types.h"
+#include "DNA_material_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_listbase.h"
@@ -30,7 +31,7 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_animsys.h"
+#include "BKE_anim_data.h"
 #include "BKE_customdata.h"
 #include "BKE_global.h"
 #include "BKE_hair.h"
@@ -48,50 +49,7 @@
 
 /* Hair datablock */
 
-static void hair_random(Hair *hair)
-{
-  const int numpoints = 8;
-
-  hair->totcurve = 500;
-  hair->totpoint = hair->totcurve * numpoints;
-
-  CustomData_realloc(&hair->pdata, hair->totpoint);
-  CustomData_realloc(&hair->cdata, hair->totcurve);
-  BKE_hair_update_customdata_pointers(hair);
-
-  RNG *rng = BLI_rng_new(0);
-
-  for (int i = 0; i < hair->totcurve; i++) {
-    HairCurve *curve = &hair->curves[i];
-    curve->firstpoint = i * numpoints;
-    curve->numpoints = numpoints;
-
-    float theta = 2.0f * M_PI * BLI_rng_get_float(rng);
-    float phi = saacosf(2.0f * BLI_rng_get_float(rng) - 1.0f);
-
-    float no[3] = {sinf(theta) * sinf(phi), cosf(theta) * sinf(phi), cosf(phi)};
-    normalize_v3(no);
-
-    float co[3];
-    copy_v3_v3(co, no);
-
-    float(*curve_co)[3] = hair->co + curve->firstpoint;
-    float *curve_radius = hair->radius + curve->firstpoint;
-    for (int key = 0; key < numpoints; key++) {
-      float t = key / (float)(numpoints - 1);
-      copy_v3_v3(curve_co[key], co);
-      curve_radius[key] = 0.02f * (1.0f - t);
-
-      float offset[3] = {2.0f * BLI_rng_get_float(rng) - 1.0f,
-                         2.0f * BLI_rng_get_float(rng) - 1.0f,
-                         2.0f * BLI_rng_get_float(rng) - 1.0f};
-      add_v3_v3(offset, no);
-      madd_v3_v3fl(co, offset, 1.0f / numpoints);
-    }
-  }
-
-  BLI_rng_free(rng);
-}
+static void hair_random(Hair *hair);
 
 static void hair_init_data(ID *id)
 {
@@ -111,15 +69,6 @@ static void hair_init_data(ID *id)
   hair_random(hair);
 }
 
-void *BKE_hair_add(Main *bmain, const char *name)
-{
-  Hair *hair = BKE_libblock_alloc(bmain, ID_HA, name, 0);
-
-  hair_init_data(&hair->id);
-
-  return hair;
-}
-
 static void hair_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag)
 {
   Hair *hair_dst = (Hair *)id_dst;
@@ -134,18 +83,6 @@ static void hair_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, co
   hair_dst->batch_cache = NULL;
 }
 
-Hair *BKE_hair_copy(Main *bmain, const Hair *hair)
-{
-  Hair *hair_copy;
-  BKE_id_copy(bmain, &hair->id, (ID **)&hair_copy);
-  return hair_copy;
-}
-
-static void hair_make_local(Main *bmain, ID *id, const int flags)
-{
-  BKE_lib_id_make_local_generic(bmain, id, flags);
-}
-
 static void hair_free_data(ID *id)
 {
   Hair *hair = (Hair *)id;
@@ -159,6 +96,14 @@ static void hair_free_data(ID *id)
   MEM_SAFE_FREE(hair->mat);
 }
 
+static void hair_foreach_id(ID *id, LibraryForeachIDData *data)
+{
+  Hair *hair = (Hair *)id;
+  for (int i = 0; i < hair->totcol; i++) {
+    BKE_LIB_FOREACHID_PROCESS(data, hair->mat[i], IDWALK_CB_USER);
+  }
+}
+
 IDTypeInfo IDType_ID_HA = {
     .id_code = ID_HA,
     .id_filter = FILTER_ID_HA,
@@ -172,9 +117,71 @@ IDTypeInfo IDType_ID_HA = {
     .init_data = hair_init_data,
     .copy_data = hair_copy_data,
     .free_data = hair_free_data,
-    .make_local = hair_make_local,
+    .make_local = NULL,
+    .foreach_id = hair_foreach_id,
 };
 
+static void hair_random(Hair *hair)
+{
+  const int numpoints = 8;
+
+  hair->totcurve = 500;
+  hair->totpoint = hair->totcurve * numpoints;
+
+  CustomData_realloc(&hair->pdata, hair->totpoint);
+  CustomData_realloc(&hair->cdata, hair->totcurve);
+  BKE_hair_update_customdata_pointers(hair);
+
+  RNG *rng = BLI_rng_new(0);
+
+  for (int i = 0; i < hair->totcurve; i++) {
+    HairCurve *curve = &hair->curves[i];
+    curve->firstpoint = i * numpoints;
+    curve->numpoints = numpoints;
+
+    float theta = 2.0f * M_PI * BLI_rng_get_float(rng);
+    float phi = saacosf(2.0f * BLI_rng_get_float(rng) - 1.0f);
+
+    float no[3] = {sinf(theta) * sinf(phi), cosf(theta) * sinf(phi), cosf(phi)};
+    normalize_v3(no);
+
+    float co[3];
+    copy_v3_v3(co, no);
+
+    float(*curve_co)[3] = hair->co + curve->firstpoint;
+    float *curve_radius = hair->radius + curve->firstpoint;
+    for (int key = 0; key < numpoints; key++) {
+      float t = key / (float)(numpoints - 1);
+      copy_v3_v3(curve_co[key], co);
+      curve_radius[key] = 0.02f * (1.0f - t);
+
+      float offset[3] = {2.0f * BLI_rng_get_float(rng) - 1.0f,
+                         2.0f * BLI_rng_get_float(rng) - 1.0f,
+                         2.0f * BLI_rng_get_float(rng) - 1.0f};
+      add_v3_v3(offset, no);
+      madd_v3_v3fl(co, offset, 1.0f / numpoints);
+    }
+  }
+
+  BLI_rng_free(rng);
+}
+
+void *BKE_hair_add(Main *bmain, const char *name)
+{
+  Hair *hair = BKE_libblock_alloc(bmain, ID_HA, name, 0);
+
+  hair_init_data(&hair->id);
+
+  return hair;
+}
+
+Hair *BKE_hair_copy(Main *bmain, const Hair *hair)
+{
+  Hair *hair_copy;
+  BKE_id_copy(bmain, &hair->id, (ID **)&hair_copy);
+  return hair_copy;
+}
+
 BoundBox *BKE_hair_boundbox_get(Object *ob)
 {
   BLI_assert(ob->type == OB_HAIR);
@@ -247,12 +254,65 @@ Hair *BKE_hair_copy_for_eval(Hair *hair_src, bool reference)
   return result;
 }
 
-static Hair *hair_evaluate_modifiers(struct Depsgraph *UNUSED(depsgraph),
-                                     struct Scene *UNUSED(scene),
-                                     Object *UNUSED(object),
+static Hair *hair_evaluate_modifiers(struct Depsgraph *depsgraph,
+                                     struct Scene *scene,
+                                     Object *object,
                                      Hair *hair_input)
 {
-  return hair_input;
+  Hair *hair = hair_input;
+
+  /* Modifier evaluation modes. */
+  const bool use_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
+  const int required_mode = use_render ? eModifierMode_Render : eModifierMode_Realtime;
+  ModifierApplyFlag apply_flag = use_render ? MOD_APPLY_RENDER : MOD_APPLY_USECACHE;
+  const ModifierEvalContext mectx = {depsgraph, object, apply_flag};
+
+  /* Get effective list of modifiers to execute. Some effects like shape keys
+   * are added as virtual modifiers before the user created modifiers. */
+  VirtualModifierData virtualModifierData;
+  ModifierData *md = BKE_modifiers_get_virtual_modifierlist(object, &virtualModifierData);
+
+  /* Evaluate modifiers. */
+  for (; md; md = md->next) {
+    const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
+
+    if (!BKE_modifier_is_enabled(scene, md, required_mode)) {
+      continue;
+    }
+
+    if ((mti->type == eModifierTypeType_OnlyDeform) &&
+        (mti->flags & eModifierTypeFlag_AcceptsVertexCosOnly)) {
+      /* Ensure we are not modifying the input. */
+      if (hair == hair_input) {
+        hair = BKE_hair_copy_for_eval(hair, true);
+      }
+
+      /* Ensure we are not overwriting referenced data. */
+      CustomData_duplicate_referenced_layer(&hair->pdata, CD_LOCATION, hair->totpoint);
+      BKE_hair_update_customdata_pointers(hair);
+
+      /* Created deformed coordinates array on demand. */
+      mti->deformVerts(md, &mectx, NULL, hair->co, hair->totpoint);
+    }
+    else if (mti->modifyHair) {
+      /* Ensure we are not modifying the input. */
+      if (hair == hair_input) {
+        hair = BKE_hair_copy_for_eval(hair, true);
+      }
+
+      Hair *hair_next = mti->modifyHair(md, &mectx, hair);
+
+      if (hair_next && hair_next != hair) {
+        /* If the modifier returned a new hair, release the old one. */
+        if (hair != hair_input) {
+          BKE_id_free(NULL, hair);
+        }
+        hair = hair_next;
+      }
+    }
+  }
+
+  return hair;
 }
 
 void BKE_hair_data_update(struct Depsgraph *depsgraph, struct Scene *scene, Object *object)