diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 83 |
1 files changed, 32 insertions, 51 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 3759b721152..6e5e38ab52e 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -45,7 +45,7 @@ #include "BKE_mesh_remap.h" #include "BKE_multires.h" #include "BKE_ocean.h" -#include "BKE_smoke.h" /* For smokeModifier_free & smokeModifier_createType */ +#include "BKE_fluid.h" /* For fluidModifier_free & fluidModifier_createType */ #include "RNA_access.h" #include "RNA_define.h" @@ -275,7 +275,6 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { ICON_MOD_EXPLODE, "Explode", "Break apart the mesh faces and let them follow particles"}, - {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""}, {eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", "Generate a moving ocean surface"}, {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", @@ -287,7 +286,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { ICON_MOD_PARTICLES, "Particle System", "Spawn particles from the shape"}, - {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, + {eModifierType_Fluid, "FLUID", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""}, {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, {eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""}, {0, NULL, 0, NULL, NULL}, @@ -580,7 +579,7 @@ const EnumPropertyItem rna_enum_axis_flag_xyz_items[] = { #ifdef RNA_RUNTIME # include "DNA_particle_types.h" # include "DNA_curve_types.h" -# include "DNA_smoke_types.h" +# include "DNA_fluid_types.h" # include "BKE_cachefile.h" # include "BKE_context.h" @@ -661,8 +660,6 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr) return &RNA_BevelModifier; case eModifierType_Shrinkwrap: return &RNA_ShrinkwrapModifier; - case eModifierType_Fluidsim: - return &RNA_FluidSimulationModifier; case eModifierType_Mask: return &RNA_MaskModifier; case eModifierType_SimpleDeform: @@ -671,8 +668,8 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr) return &RNA_MultiresModifier; case eModifierType_Surface: return &RNA_SurfaceModifier; - case eModifierType_Smoke: - return &RNA_SmokeModifier; + case eModifierType_Fluid: + return &RNA_FluidModifier; case eModifierType_Solidify: return &RNA_SolidifyModifier; case eModifierType_Screw: @@ -720,6 +717,8 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA *ptr) case eModifierType_WeightedNormal: return &RNA_WeightedNormalModifier; /* Default */ + case eModifierType_Fluidsim: /* deprecated */ + case eModifierType_Smoke: case eModifierType_None: case eModifierType_ShapeKey: case NUM_MODIFIER_TYPES: @@ -1029,25 +1028,25 @@ static void rna_UVProjector_object_set(PointerRNA *ptr, /* Other rna callbacks */ -static void rna_Smoke_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) +static void rna_fluid_set_type(Main *bmain, Scene *scene, PointerRNA *ptr) { - SmokeModifierData *smd = (SmokeModifierData *)ptr->data; + FluidModifierData *mmd = (FluidModifierData *)ptr->data; Object *ob = (Object *)ptr->owner_id; /* nothing changed */ - if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { + if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) { return; } - smokeModifier_free(smd); /* XXX TODO: completely free all 3 pointers */ - smokeModifier_createType(smd); /* create regarding of selected type */ + fluidModifier_free(mmd); /* XXX TODO: completely free all 3 pointers */ + fluidModifier_createType(mmd); /* create regarding of selected type */ - switch (smd->type) { - case MOD_SMOKE_TYPE_DOMAIN: + switch (mmd->type) { + case MOD_FLUID_TYPE_DOMAIN: ob->dt = OB_WIRE; break; - case MOD_SMOKE_TYPE_FLOW: - case MOD_SMOKE_TYPE_COLL: + case MOD_FLUID_TYPE_FLOW: + case MOD_FLUID_TYPE_EFFEC: case 0: default: break; @@ -3607,23 +3606,23 @@ static void rna_def_modifier_cloth(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Hair Grid Resolution", ""); } -static void rna_def_modifier_smoke(BlenderRNA *brna) +static void rna_def_modifier_fluid(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - static const EnumPropertyItem prop_smoke_type_items[] = { + static const EnumPropertyItem prop_fluid_type_items[] = { {0, "NONE", 0, "None", ""}, - {MOD_SMOKE_TYPE_DOMAIN, "DOMAIN", 0, "Domain", ""}, - {MOD_SMOKE_TYPE_FLOW, "FLOW", 0, "Flow", "Inflow/Outflow"}, - {MOD_SMOKE_TYPE_COLL, "COLLISION", 0, "Collision", ""}, + {MOD_FLUID_TYPE_DOMAIN, "DOMAIN", 0, "Domain", ""}, + {MOD_FLUID_TYPE_FLOW, "FLOW", 0, "Flow", "Inflow/Outflow"}, + {MOD_FLUID_TYPE_EFFEC, "EFFECTOR", 0, "Effector", ""}, {0, NULL, 0, NULL, NULL}, }; - srna = RNA_def_struct(brna, "SmokeModifier", "Modifier"); - RNA_def_struct_ui_text(srna, "Smoke Modifier", "Smoke simulation modifier"); - RNA_def_struct_sdna(srna, "SmokeModifierData"); - RNA_def_struct_ui_icon(srna, ICON_MOD_SMOKE); + srna = RNA_def_struct(brna, "FluidModifier", "Modifier"); + RNA_def_struct_ui_text(srna, "Fluid Modifier", "Fluid simulation modifier"); + RNA_def_struct_sdna(srna, "FluidModifierData"); + RNA_def_struct_ui_icon(srna, ICON_MOD_FLUIDSIM); prop = RNA_def_property(srna, "domain_settings", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "domain"); @@ -3633,16 +3632,16 @@ static void rna_def_modifier_smoke(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "flow"); RNA_def_property_ui_text(prop, "Flow Settings", ""); - prop = RNA_def_property(srna, "coll_settings", PROP_POINTER, PROP_NONE); - RNA_def_property_pointer_sdna(prop, NULL, "coll"); - RNA_def_property_ui_text(prop, "Collision Settings", ""); + prop = RNA_def_property(srna, "effec_settings", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "effector"); + RNA_def_property_ui_text(prop, "Effector Settings", ""); - prop = RNA_def_property(srna, "smoke_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "fluid_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type"); - RNA_def_property_enum_items(prop, prop_smoke_type_items); + RNA_def_property_enum_items(prop, prop_fluid_type_items); RNA_def_property_ui_text(prop, "Type", ""); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_update(prop, 0, "rna_Smoke_set_type"); + RNA_def_property_update(prop, 0, "rna_fluid_set_type"); } static void rna_def_modifier_dynamic_paint(BlenderRNA *brna) @@ -4069,23 +4068,6 @@ static void rna_def_modifier_shrinkwrap(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); } -static void rna_def_modifier_fluidsim(BlenderRNA *brna) -{ - StructRNA *srna; - PropertyRNA *prop; - - srna = RNA_def_struct(brna, "FluidSimulationModifier", "Modifier"); - RNA_def_struct_ui_text(srna, "Fluid Simulation Modifier", "Fluid simulation modifier"); - RNA_def_struct_sdna(srna, "FluidsimModifierData"); - RNA_def_struct_ui_icon(srna, ICON_MOD_FLUIDSIM); - - prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE); - RNA_def_property_flag(prop, PROP_NEVER_NULL); - RNA_def_property_pointer_sdna(prop, NULL, "fss"); - RNA_def_property_ui_text( - prop, "Settings", "Settings for how this object is used in the fluid simulation"); -} - static void rna_def_modifier_mask(BlenderRNA *brna) { StructRNA *srna; @@ -6388,13 +6370,12 @@ void RNA_def_modifier(BlenderRNA *brna) rna_def_modifier_collision(brna); rna_def_modifier_bevel(brna); rna_def_modifier_shrinkwrap(brna); - rna_def_modifier_fluidsim(brna); rna_def_modifier_mask(brna); rna_def_modifier_simpledeform(brna); rna_def_modifier_warp(brna); rna_def_modifier_multires(brna); rna_def_modifier_surface(brna); - rna_def_modifier_smoke(brna); + rna_def_modifier_fluid(brna); rna_def_modifier_solidify(brna); rna_def_modifier_screw(brna); rna_def_modifier_uvwarp(brna); |