[Bf-blender-cvs] [d7ba494283f] hair_guides: Rename "Hair" modifier to "Fur" modifier.

Lukas Tönne noreply at git.blender.org
Wed Nov 15 09:43:25 CET 2017


Commit: d7ba494283fe7dc0d957693e1f8312540f001024
Author: Lukas Tönne
Date:   Wed Nov 15 08:40:51 2017 +0000
Branches: hair_guides
https://developer.blender.org/rBd7ba494283fe7dc0d957693e1f8312540f001024

Rename "Hair" modifier to "Fur" modifier.

This will be a simple testbed for generating hair geometry.

The plan here is to use different modifiers for different editing methods
for hair. Each of these will use a HairSystem instance, but vary
in the editable data used to generate guide curves. The hair system
underneath is agnostic to the editing method used.

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/modifiers/MOD_modifiertypes.h
R076	source/blender/modifiers/intern/MOD_hair.c	source/blender/modifiers/intern/MOD_fur.c
M	source/blender/modifiers/intern/MOD_util.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 58b7ceb0a06..429aa1df67f 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1542,7 +1542,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         if md.rest_source == 'BIND':
             layout.operator("object.correctivesmooth_bind", text="Unbind" if is_bind else "Bind")
 
-    def HAIR(self, layout, ob, md):
+    def FUR(self, layout, ob, md):
         pass
 
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 278b4fb4dc9..22a12bc55af 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5471,11 +5471,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 				}
 			}
 		}
-		else if (md->type == eModifierType_Hair) {
-			HairModifierData *hmd = (HairModifierData *)md;
+		else if (md->type == eModifierType_Fur) {
+			FurModifierData *fmd = (FurModifierData *)md;
 			
-			hmd->hair_system = newdataadr(fd, hmd->hair_system);
-			direct_link_hair(fd, hmd->hair_system);
+			fmd->hair_system = newdataadr(fd, fmd->hair_system);
+			direct_link_hair(fd, fmd->hair_system);
 		}
 	}
 }
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index cafbe94ba03..983ec3b3956 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1890,12 +1890,12 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 				}
 			}
 		}
-		else if (md->type == eModifierType_Hair) {
-			HairModifierData *hmd = (HairModifierData *)md;
+		else if (md->type == eModifierType_Fur) {
+			FurModifierData *fmd = (FurModifierData *)md;
 			
-			if (hmd->hair_system) {
-				writestruct(wd, DATA, HairSystem, 1, hmd->hair_system);
-				write_hair(wd, hmd->hair_system);
+			if (fmd->hair_system) {
+				writestruct(wd, DATA, HairSystem, 1, fmd->hair_system);
+				write_hair(wd, fmd->hair_system);
 			}
 		}
 	}
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 6efee5ab1a1..98eaedc8fd9 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1521,9 +1521,9 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_SceneLayerData *sl
 					ParticleSystem *psys = ((ParticleSystemModifierData *)md)->psys;
 					material_particle_hair(sldata, vedata, ob, psys, md);
 				}
-				else if (md->type == eModifierType_Hair) {
-					HairModifierData *hmd = (HairModifierData *)md;
-					material_hair(sldata, vedata, ob, hmd->hair_system, ob->derivedFinal);
+				else if (md->type == eModifierType_Fur) {
+					FurModifierData *fmd = (FurModifierData *)md;
+					material_hair(sldata, vedata, ob, fmd->hair_system, ob->derivedFinal);
 				}
 			}
 		}
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index df2b9e5f2f0..f8263409455 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1052,7 +1052,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
 					case eModifierType_NormalEdit:
 						ICON_DRAW(ICON_MOD_NORMALEDIT);
 						break;
-					case eModifierType_Hair:
+					case eModifierType_Fur:
 						ICON_DRAW(ICON_STRANDS);
 						break;
 					/* Default */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index b0fc650835d..8f8e0e9bfae 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -87,7 +87,7 @@ typedef enum ModifierType {
 	eModifierType_CorrectiveSmooth  = 51,
 	eModifierType_MeshSequenceCache = 52,
 	eModifierType_SurfaceDeform     = 53,
-	eModifierType_Hair              = 54,
+	eModifierType_Fur               = 54,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -1627,14 +1627,14 @@ enum {
 #define MOD_MESHSEQ_READ_ALL \
 	(MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR)
 
-/* Hair modifier */
-typedef struct HairModifierData {
+/* Fur modifier */
+typedef struct FurModifierData {
 	ModifierData modifier;
 	
 	int flag;
 	int pad;
 	
 	struct HairSystem *hair_system;
-} HairModifierData;
+} FurModifierData;
 
 #endif  /* __DNA_MODIFIER_TYPES_H__ */
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 9a7821b76e9..4982fcc9ba6 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -263,6 +263,7 @@ extern StructRNA RNA_FreestyleLineSet;
 extern StructRNA RNA_FreestyleModuleSettings;
 extern StructRNA RNA_FreestyleSettings;
 extern StructRNA RNA_Function;
+extern StructRNA RNA_FurModifier;
 extern StructRNA RNA_GPencilFrame;
 extern StructRNA RNA_GPencilLayer;
 extern StructRNA RNA_GPencilPalette;
@@ -286,7 +287,6 @@ extern StructRNA RNA_GlowSequence;
 extern StructRNA RNA_GreasePencil;
 extern StructRNA RNA_Group;
 extern StructRNA RNA_HairGroup;
-extern StructRNA RNA_HairModifier;
 extern StructRNA RNA_HairPattern;
 extern StructRNA RNA_Header;
 extern StructRNA RNA_HemiLamp;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index abd575f1666..597359a7d60 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -114,7 +114,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
 	{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
 	{eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
 	{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
-	{eModifierType_Hair, "HAIR", ICON_STRANDS, "Hair", ""},
+	{eModifierType_Fur, "FUR", ICON_STRANDS, "Fur", ""},
 	{eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", ""},
 	{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
 	{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
@@ -414,8 +414,8 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr)
 			return &RNA_MeshSequenceCacheModifier;
 		case eModifierType_SurfaceDeform:
 			return &RNA_SurfaceDeformModifier;
-		case eModifierType_Hair:
-			return &RNA_HairModifier;
+		case eModifierType_Fur:
+			return &RNA_FurModifier;
 		/* Default */
 		case eModifierType_None:
 		case eModifierType_ShapeKey:
@@ -4796,14 +4796,14 @@ static void rna_def_modifier_surfacedeform(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 }
 
-static void rna_def_modifier_hair(BlenderRNA *brna)
+static void rna_def_modifier_fur(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
 
-	srna = RNA_def_struct(brna, "HairModifier", "Modifier");
-	RNA_def_struct_ui_text(srna, "Hair Modifier", "");
-	RNA_def_struct_sdna(srna, "HairModifierData");
+	srna = RNA_def_struct(brna, "FurModifier", "Modifier");
+	RNA_def_struct_ui_text(srna, "Fur Modifier", "");
+	RNA_def_struct_sdna(srna, "FurModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_STRANDS);
 
 	prop = RNA_def_property(srna, "hair_system", PROP_POINTER, PROP_NONE);
@@ -4929,7 +4929,7 @@ void RNA_def_modifier(BlenderRNA *brna)
 	rna_def_modifier_normaledit(brna);
 	rna_def_modifier_meshseqcache(brna);
 	rna_def_modifier_surfacedeform(brna);
-	rna_def_modifier_hair(brna);
+	rna_def_modifier_fur(brna);
 }
 
 #endif
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 0632578cfc4..8066d0605fc 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -63,7 +63,7 @@ set(SRC
 	intern/MOD_explode.c
 	intern/MOD_fluidsim.c
 	intern/MOD_fluidsim_util.c
-	intern/MOD_hair.c
+	intern/MOD_fur.c
 	intern/MOD_hook.c
 	intern/MOD_laplaciandeform.c
 	intern/MOD_laplaciansmooth.c
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index cf3794dfaa5..ff486287d7e 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -86,7 +86,7 @@ extern ModifierTypeInfo modifierType_NormalEdit;
 extern ModifierTypeInfo modifierType_CorrectiveSmooth;
 extern ModifierTypeInfo modifierType_MeshSequenceCache;
 extern ModifierTypeInfo modifierType_SurfaceDeform;
-extern ModifierTypeInfo modifierType_Hair;
+extern ModifierTypeInfo modifierType_Fur;
 
 /* MOD_util.c */
 void modifier_type_init(ModifierTypeInfo *types[]);
diff --git a/source/blender/modifiers/intern/MOD_hair.c b/source/blender/modifiers/intern/MOD_fur.c
similarity index 76%
rename from source/blender/modifiers/intern/MOD_hair.c
rename to source/blender/modifiers/intern/MOD_fur.c
index 5f71d668871..752e47176f1 100644
--- a/source/blender/modifiers/intern/MOD_hair.c
+++ b/source/blender/modifiers/intern/MOD_fur.c
@@ -28,7 +28,7 @@
  *
  */
 
-/** \file blender/modifiers/intern/MOD_displace.c
+/** \file blender/modifiers/intern/MOD_fur.c
  *  \ingroup modifiers
  */
 
@@ -52,35 +52,35 @@
 
 static void initData(ModifierData *md)
 {
-	HairModifierData *hmd = (HairModifierData *) md;
+	FurModifierData *fmd = (FurModifierData *) md;
 	
-	hmd->hair_system = BKE_hair_new();
+	fmd->hair_system = BKE_hair_new();
 	
-	hmd->flag |= 0;
+	fmd->flag |= 0;
 }
 
 static void copyData(ModifierData *md, ModifierData *target)
 {
-	HairModifierData *hmd = (HairModifierData *) md;
-	HairModifierData *thmd = (HairModifierData *) target;
+	FurModifierData *fmd = (FurModifierData *) md;
+	FurModifierData *tfmd = (FurModifierData *) target;
 
-	if (thmd->hair_system) {
-		BKE_hair_free(thmd->hair_system);
+	if (tfmd->hair_system) {
+		BKE_hair_free(tfmd->hair_system);
 	}
 
 	modifier_copyData_generic(md, target);
 	
-	if (hmd->hair_system) {
-		thmd->hair_system = BKE_hair_copy(hmd->hair_system);
+	if (fmd

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list