Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenkernel/intern/object.c
| Show All 33 Lines | |||||
| #include "DNA_camera_types.h" | #include "DNA_camera_types.h" | ||||
| #include "DNA_collection_types.h" | #include "DNA_collection_types.h" | ||||
| #include "DNA_constraint_types.h" | #include "DNA_constraint_types.h" | ||||
| #include "DNA_gpencil_types.h" | #include "DNA_gpencil_types.h" | ||||
| #include "DNA_gpencil_modifier_types.h" | #include "DNA_gpencil_modifier_types.h" | ||||
| #include "DNA_key_types.h" | #include "DNA_key_types.h" | ||||
| #include "DNA_light_types.h" | #include "DNA_light_types.h" | ||||
| #include "DNA_lattice_types.h" | #include "DNA_lattice_types.h" | ||||
| #include "DNA_fluid_types.h" | |||||
| #include "DNA_material_types.h" | #include "DNA_material_types.h" | ||||
| #include "DNA_meta_types.h" | #include "DNA_meta_types.h" | ||||
| #include "DNA_mesh_types.h" | #include "DNA_mesh_types.h" | ||||
| #include "DNA_meshdata_types.h" | #include "DNA_meshdata_types.h" | ||||
| #include "DNA_movieclip_types.h" | #include "DNA_movieclip_types.h" | ||||
| #include "DNA_scene_types.h" | #include "DNA_scene_types.h" | ||||
| #include "DNA_screen_types.h" | #include "DNA_screen_types.h" | ||||
| #include "DNA_sequence_types.h" | #include "DNA_sequence_types.h" | ||||
| #include "DNA_shader_fx_types.h" | #include "DNA_shader_fx_types.h" | ||||
| #include "DNA_smoke_types.h" | |||||
| #include "DNA_space_types.h" | #include "DNA_space_types.h" | ||||
| #include "DNA_view3d_types.h" | #include "DNA_view3d_types.h" | ||||
| #include "DNA_world_types.h" | #include "DNA_world_types.h" | ||||
| #include "DNA_object_types.h" | #include "DNA_object_types.h" | ||||
| #include "DNA_lightprobe_types.h" | #include "DNA_lightprobe_types.h" | ||||
| #include "DNA_rigidbody_types.h" | #include "DNA_rigidbody_types.h" | ||||
| #include "DNA_defaults.h" | #include "DNA_defaults.h" | ||||
| ▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines | |||||
| #include "BKE_image.h" | #include "BKE_image.h" | ||||
| #include "BKE_gpencil.h" | #include "BKE_gpencil.h" | ||||
| #include "DEG_depsgraph.h" | #include "DEG_depsgraph.h" | ||||
| #include "DEG_depsgraph_query.h" | #include "DEG_depsgraph_query.h" | ||||
| #include "DRW_engine.h" | #include "DRW_engine.h" | ||||
| #ifdef WITH_MOD_FLUID | |||||
| # include "LBM_fluidsim.h" | |||||
| #endif | |||||
| #ifdef WITH_PYTHON | #ifdef WITH_PYTHON | ||||
| # include "BPY_extern.h" | # include "BPY_extern.h" | ||||
| #endif | #endif | ||||
| #include "CCGSubSurf.h" | #include "CCGSubSurf.h" | ||||
| #include "atomic_ops.h" | #include "atomic_ops.h" | ||||
| static CLG_LogRef LOG = {"bke.object"}; | static CLG_LogRef LOG = {"bke.object"}; | ||||
| ▲ Show 20 Lines • Show All 987 Lines • ▼ Show 20 Lines | for (md = ob_dst->modifiers.first; md; md = md->next) { | ||||
| else if (md->type == eModifierType_DynamicPaint) { | else if (md->type == eModifierType_DynamicPaint) { | ||||
| DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; | DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; | ||||
| if (pmd->brush) { | if (pmd->brush) { | ||||
| if (pmd->brush->psys == psys) { | if (pmd->brush->psys == psys) { | ||||
| pmd->brush->psys = npsys; | pmd->brush->psys = npsys; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| else if (md->type == eModifierType_Smoke) { | else if (md->type == eModifierType_Fluid) { | ||||
| SmokeModifierData *smd = (SmokeModifierData *)md; | FluidModifierData *mmd = (FluidModifierData *)md; | ||||
| if (smd->type == MOD_SMOKE_TYPE_FLOW) { | if (mmd->type == MOD_FLUID_TYPE_FLOW) { | ||||
| if (smd->flow) { | if (mmd->flow) { | ||||
| if (smd->flow->psys == psys) { | if (mmd->flow->psys == psys) { | ||||
| smd->flow->psys = npsys; | mmd->flow->psys = npsys; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 3,227 Lines • ▼ Show 20 Lines | bool BKE_object_modifier_update_subframe(Depsgraph *depsgraph, | ||||
| if (type == eModifierType_DynamicPaint) { | if (type == eModifierType_DynamicPaint) { | ||||
| DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; | DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; | ||||
| /* if other is dynamic paint canvas, don't update */ | /* if other is dynamic paint canvas, don't update */ | ||||
| if (pmd && pmd->canvas) { | if (pmd && pmd->canvas) { | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| else if (type == eModifierType_Smoke) { | else if (type == eModifierType_Fluid) { | ||||
| SmokeModifierData *smd = (SmokeModifierData *)md; | FluidModifierData *mmd = (FluidModifierData *)md; | ||||
| if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) != 0) { | if (mmd && (mmd->type & MOD_FLUID_TYPE_DOMAIN) != 0) { | ||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| /* if object has parents, update them too */ | /* if object has parents, update them too */ | ||||
| if (parent_recursion) { | if (parent_recursion) { | ||||
| int recursion = parent_recursion - 1; | int recursion = parent_recursion - 1; | ||||
| bool no_update = false; | bool no_update = false; | ||||
| ▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines | |||||