diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:50:14 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 18:37:01 +0300 |
commit | d27ccf990c2b957a10f4676e3153f907829a4b22 (patch) | |
tree | 48667db9d5f51e3c951cb1106566a53db21d9adf /source/blender/editors | |
parent | 7b87d3d34ec5bbaf777bdc27abdb69600915fce1 (diff) |
Mantaflow [Part 6]: Updates in /blender/source
A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming.
Reviewed By: sergey
Maniphest Tasks: T59995
Differential Revision: https://developer.blender.org/D3855
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 3 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 13 | ||||
-rw-r--r-- | source/blender/editors/physics/CMakeLists.txt | 13 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 2 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_intern.h | 14 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_ops.c | 14 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 17 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/CMakeLists.txt | 6 |
10 files changed, 49 insertions, 41 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index fd8fe103a2d..4cc0c865093 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -385,9 +385,8 @@ set(ICON_NAMES mod_mask mod_cloth mod_explode - mod_fluidsim mod_multires - mod_smoke + mod_fluid mod_solidify mod_screw mod_vertex_weight diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 2bf50d3b4b8..44c734e264a 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -560,7 +560,7 @@ DEF_ICON_MODIFIER(MOD_CLOTH) DEF_ICON_MODIFIER(MOD_EXPLODE) DEF_ICON_MODIFIER(MOD_FLUIDSIM) DEF_ICON_MODIFIER(MOD_MULTIRES) -DEF_ICON_MODIFIER(MOD_SMOKE) +DEF_ICON_MODIFIER(MOD_FLUID) DEF_ICON_MODIFIER(MOD_SOLIDIFY) DEF_ICON_MODIFIER(MOD_SCREW) DEF_ICON_MODIFIER(MOD_VERTEX_WEIGHT) diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 17247736d3b..de37219e009 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1819,11 +1819,16 @@ static int modifier_can_delete(ModifierData *md) { /* fluid particle modifier can't be deleted here */ if (md->type == eModifierType_ParticleSystem) { - if (((ParticleSystemModifierData *)md)->psys->part->type == PART_FLUID) { + short particle_type = ((ParticleSystemModifierData *)md)->psys->part->type; + if (particle_type == PART_FLUID || + particle_type == PART_FLUID_FLIP || + particle_type == PART_FLUID_FOAM || + particle_type == PART_FLUID_SPRAY || + particle_type == PART_FLUID_BUBBLE || + particle_type == PART_FLUID_BUBBLE) { return 0; } } - return 1; } @@ -1836,7 +1841,7 @@ static int modifier_is_simulation(ModifierData *md) eModifierType_Cloth, eModifierType_Collision, eModifierType_Fluidsim, - eModifierType_Smoke, + eModifierType_Fluid, eModifierType_Softbody, eModifierType_Surface, eModifierType_DynamicPaint)) { @@ -2069,7 +2074,7 @@ static uiLayout *draw_modifier(uiLayout *layout, eModifierType_Softbody, eModifierType_ParticleSystem, eModifierType_Cloth, - eModifierType_Smoke)) { + eModifierType_Fluid)) { uiItemO(row, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy"), ICON_NONE, diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 021c17a94c2..ee8d345524e 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -27,6 +27,7 @@ set(INC ../../windowmanager ../../../../intern/glew-mx ../../../../intern/guardedalloc + ../../../../intern/mantaflow/extern ) set(INC_SYS @@ -56,18 +57,8 @@ set(LIB ) if(WITH_MOD_FLUID) - list(APPEND INC - ../../../../intern/elbeem/extern - ) - list(APPEND LIB - bf_intern_elbeem - ) - add_definitions(-DWITH_MOD_FLUID) -endif() - -if(WITH_MOD_SMOKE) list(APPEND LIB - bf_intern_smoke + bf_intern_mantaflow ) endif() diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index cfb3a400f47..4df74434c6a 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -1065,7 +1065,7 @@ static void remove_particle_systems_from_object(Object *ob_to) if (ELEM(md->type, eModifierType_ParticleSystem, eModifierType_DynamicPaint, - eModifierType_Smoke)) { + eModifierType_Fluid)) { BLI_remlink(&ob_to->modifiers, md); modifier_free(md); } diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index fc2f3d21bb6..1c091fc18da 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -103,7 +103,19 @@ void BOID_OT_state_move_up(struct wmOperatorType *ot); void BOID_OT_state_move_down(struct wmOperatorType *ot); /* physics_fluid.c */ -void FLUID_OT_bake(struct wmOperatorType *ot); +void FLUID_OT_bake_all(struct wmOperatorType *ot); +void FLUID_OT_free_all(struct wmOperatorType *ot); +void FLUID_OT_bake_data(struct wmOperatorType *ot); +void FLUID_OT_free_data(struct wmOperatorType *ot); +void FLUID_OT_bake_noise(struct wmOperatorType *ot); +void FLUID_OT_free_noise(struct wmOperatorType *ot); +void FLUID_OT_bake_mesh(struct wmOperatorType *ot); +void FLUID_OT_free_mesh(struct wmOperatorType *ot); +void FLUID_OT_bake_particles(struct wmOperatorType *ot); +void FLUID_OT_free_particles(struct wmOperatorType *ot); +void FLUID_OT_bake_guiding(struct wmOperatorType *ot); +void FLUID_OT_free_guiding(struct wmOperatorType *ot); +void FLUID_OT_pause_bake(struct wmOperatorType *ot); /* dynamicpaint.c */ void DPAINT_OT_bake(struct wmOperatorType *ot); diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index b1b3927d05e..843c8f0a63b 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -126,7 +126,19 @@ static void operatortypes_boids(void) static void operatortypes_fluid(void) { - WM_operatortype_append(FLUID_OT_bake); + WM_operatortype_append(FLUID_OT_bake_all); + WM_operatortype_append(FLUID_OT_free_all); + WM_operatortype_append(FLUID_OT_bake_data); + WM_operatortype_append(FLUID_OT_free_data); + WM_operatortype_append(FLUID_OT_bake_noise); + WM_operatortype_append(FLUID_OT_free_noise); + WM_operatortype_append(FLUID_OT_bake_mesh); + WM_operatortype_append(FLUID_OT_free_mesh); + WM_operatortype_append(FLUID_OT_bake_particles); + WM_operatortype_append(FLUID_OT_free_particles); + WM_operatortype_append(FLUID_OT_bake_guiding); + WM_operatortype_append(FLUID_OT_free_guiding); + WM_operatortype_append(FLUID_OT_pause_bake); } /**************************** point cache **********************************/ diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 8cb0a3f3c86..ecd2b5a3697 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -770,7 +770,6 @@ const char *buttons_context_dir[] = { "cloth", "soft_body", "fluid", - "smoke", "collision", "brush", "dynamic_paint", @@ -1018,24 +1017,14 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r return 1; } } - else if (CTX_data_equals(member, "fluid")) { - PointerRNA *ptr = get_pointer_type(path, &RNA_Object); - if (ptr && ptr->data) { - Object *ob = ptr->data; - ModifierData *md = modifiers_findByType(ob, eModifierType_Fluidsim); - CTX_data_pointer_set(result, &ob->id, &RNA_FluidSimulationModifier, md); - return 1; - } - } - - else if (CTX_data_equals(member, "smoke")) { + else if (CTX_data_equals(member, "fluid")) { PointerRNA *ptr = get_pointer_type(path, &RNA_Object); if (ptr && ptr->data) { Object *ob = ptr->data; - ModifierData *md = modifiers_findByType(ob, eModifierType_Smoke); - CTX_data_pointer_set(result, &ob->id, &RNA_SmokeModifier, md); + ModifierData *md = modifiers_findByType(ob, eModifierType_Fluid); + CTX_data_pointer_set(result, &ob->id, &RNA_FluidModifier, md); return 1; } } diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 486be952b2f..2c2989a284d 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -2125,14 +2125,14 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te) case eModifierType_Surface: data.icon = ICON_MOD_PHYSICS; break; - case eModifierType_Fluidsim: + case eModifierType_Fluidsim: /* deprecated, old fluid modifier */ data.icon = ICON_MOD_FLUIDSIM; break; case eModifierType_Multires: data.icon = ICON_MOD_MULTIRES; break; - case eModifierType_Smoke: - data.icon = ICON_MOD_SMOKE; + case eModifierType_Fluid: + data.icon = ICON_MOD_FLUID; break; case eModifierType_Solidify: data.icon = ICON_MOD_SOLIDIFY; diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 2feef9e0c9a..95d7f79f666 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -32,7 +32,7 @@ set(INC ../../windowmanager ../../../../intern/glew-mx ../../../../intern/guardedalloc - ../../../../intern/smoke/extern + ../../../../intern/mantaflow/extern # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern @@ -95,8 +95,8 @@ if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() -if(WITH_MOD_SMOKE) - add_definitions(-DWITH_SMOKE) +if(WITH_MOD_FLUID) + add_definitions(-DWITH_FLUID) endif() blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") |