[Bf-blender-cvs] [180163c4e44] master: Cleanup: Further hair to curves renaming

[Hans Goudey]

Commit: 180163c4e4484b2d88f98aa059bbb263a94b989b
Author: Hans Goudey
Date:   Wed Apr 13 22:52:09 2022 -0500
Branches: master
https://developer.blender.org/rB180163c4e4484b2d88f98aa059bbb263a94b989b

Cleanup: Further hair to curves renaming

These were missed in previous passes. Also remove some logic
in `draw_hair.c` that was redundant after f31c3f8114616bb8964c8e7.

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

M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/draw/intern/draw_hair.c
M	source/blender/editors/animation/anim_channels_defines.c
M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/object/object_modifier.c
M	source/blender/editors/space_file/filelist.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index f58c2339c82..4606b0d6d06 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -666,7 +666,7 @@ typedef struct EEVEE_HairMotionData {
   /** Needs to be first to ensure casting. */
   eEEVEEMotionData type;
   int use_deform;
-  /** Allocator will alloc enough slot for all particle systems. Or 1 if it's a hair object. */
+  /** Allocator will alloc enough slot for all particle systems. Or 1 if it's a curves object. */
   int psys_len;
   struct {
     /* The vbos and textures are not owned. */
diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c
index 0a447bf7041..0ac8bf91906 100644
--- a/source/blender/draw/intern/draw_hair.c
+++ b/source/blender/draw/intern/draw_hair.c
@@ -298,23 +298,11 @@ DRWShadingGroup *DRW_shgroup_hair_create_sub(Object *object,
   DRW_hair_duplimat_get(object, psys, md, dupli_mat);
 
   /* Get hair shape parameters. */
-  float hair_rad_shape, hair_rad_root, hair_rad_tip;
-  bool hair_close_tip;
-  if (psys) {
-    /* Old particle hair. */
-    ParticleSettings *part = psys->part;
-    hair_rad_shape = part->shape;
-    hair_rad_root = part->rad_root * part->rad_scale * 0.5f;
-    hair_rad_tip = part->rad_tip * part->rad_scale * 0.5f;
-    hair_close_tip = (part->shape_flag & PART_SHAPE_CLOSE_TIP) != 0;
-  }
-  else {
-    /* TODO: implement for new curves object. */
-    hair_rad_shape = 1.0f;
-    hair_rad_root = 0.005f;
-    hair_rad_tip = 0.0f;
-    hair_close_tip = true;
-  }
+  ParticleSettings *part = psys->part;
+  float hair_rad_shape = part->shape;
+  float hair_rad_root = part->rad_root * part->rad_scale * 0.5f;
+  float hair_rad_tip = part->rad_tip * part->rad_scale * 0.5f;
+  bool hair_close_tip = (part->shape_flag & PART_SHAPE_CLOSE_TIP) != 0;
 
   DRW_shgroup_uniform_texture(shgrp, "hairPointBuffer", hair_cache->final[subdiv].proc_tex);
   if (hair_cache->length_tex) {
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index ead189c0389..eb7f8e8ad83 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2796,7 +2796,7 @@ static bAnimChannelType ACF_DSSPK = {
     acf_dsspk_setting_ptr,                /* pointer for setting */
 };
 
-/* Hair Expander  ------------------------------------------- */
+/* Curves Expander  ------------------------------------------- */
 
 /* TODO: just get this from RNA? */
 static int acf_dscurves_icon(bAnimListElem *UNUSED(ale))
@@ -2859,7 +2859,7 @@ static void *acf_dscurves_setting_ptr(bAnimListElem *ale,
 }
 
 /** Curves expander type define. */
-static bAnimChannelType ACF_DSHAIR = {
+static bAnimChannelType ACF_DSCURVES = {
     "Curves Expander",      /* type name */
     ACHANNEL_ROLE_EXPANDER, /* role */
 
@@ -4129,7 +4129,7 @@ static void ANIM_init_channel_typeinfo_data(void)
     animchannelTypeInfo[type++] = &ACF_DSSPK;        /* Speaker Channel */
     animchannelTypeInfo[type++] = &ACF_DSGPENCIL;    /* GreasePencil Channel */
     animchannelTypeInfo[type++] = &ACF_DSMCLIP;      /* MovieClip Channel */
-    animchannelTypeInfo[type++] = &ACF_DSHAIR;       /* Hair Channel */
+    animchannelTypeInfo[type++] = &ACF_DSCURVES;     /* Curves Channel */
     animchannelTypeInfo[type++] = &ACF_DSPOINTCLOUD; /* PointCloud Channel */
     animchannelTypeInfo[type++] = &ACF_DSVOLUME;     /* Volume Channel */
     animchannelTypeInfo[type++] = &ACF_DSSIMULATION; /* Simulation Channel */
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 38499a7f089..a5e2e9353bf 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -787,7 +787,7 @@ static const char *template_id_browse_tip(const StructRNA *type)
       case ID_LP:
         return N_("Browse LightProbe to be linked");
       case ID_CV:
-        return N_("Browse Hair Curves Data to be linked");
+        return N_("Browse Curves Data to be linked");
       case ID_PT:
         return N_("Browse Point Cloud Data to be linked");
       case ID_VO:
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 545265b18b1..6a230669056 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -698,7 +698,7 @@ static bool modifier_apply_shape(Main *bmain,
     BKE_id_free(NULL, mesh_applied);
   }
   else {
-    /* TODO: implement for hair, point clouds and volumes. */
+    /* TODO: implement for curves, point clouds and volumes. */
     BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
     return false;
   }
@@ -800,7 +800,7 @@ static bool modifier_apply_obdata(
     DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
   }
   else {
-    /* TODO: implement for hair, point clouds and volumes. */
+    /* TODO: implement for curves, point clouds and volumes. */
     BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
     return false;
   }
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 08f4ecc0dd9..9f71d6f77c7 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -3403,7 +3403,7 @@ static void filelist_readjob_main_recursive(Main *bmain, FileList *filelist)
     filelist->filelist.entries[20].entry->relpath = BLI_strdup("Action");
     filelist->filelist.entries[21].entry->relpath = BLI_strdup("NodeTree");
     filelist->filelist.entries[22].entry->relpath = BLI_strdup("Speaker");
-    filelist->filelist.entries[23].entry->relpath = BLI_strdup("Hair");
+    filelist->filelist.entries[23].entry->relpath = BLI_strdup("Curves");
     filelist->filelist.entries[24].entry->relpath = BLI_strdup("Point Cloud");
     filelist->filelist.entries[25].entry->relpath = BLI_strdup("Volume");
 #  ifdef WITH_FREESTYLE