wangdequan/workinf_Blender_Wasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(web): synchronize WebEngine WASM with Blender sources
Some checks failed
M6 deployable RC / quick (push) Has been cancelled
Details
M6 deployable RC / chromium (push) Has been cancelled
Details
M6 deployable RC / release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
mes123456
2026-09-07 11:33:34 +08:00
parent e3677bd2a1
commit d5e736b80d
20 changed files with 423 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
blender-5.2.0/source/blender/modifiers/intern/MOD_util.cc
View File

@@ -26,6 +26,9 @@
#include "BKE_modifier.hh"
#include "UI_resources.hh"
#include "RNA_prototypes.hh"
#include "DEG_depsgraph_query.hh"
#include "MOD_modifiertypes.hh"
@@ -35,6 +38,42 @@
namespace blender {
#ifdef WITH_WEB
/* Web keeps simulation modifiers metadata-only, but the concrete DNA type is
* required so BLO_write_file serializes the same block layout it read. */
static bool web_simulation_modifier_disabled(const Scene * /*scene*/,
ModifierData * /*md*/,
const bool /*use_render_params*/)
{
return true;
}
static ModifierTypeInfo web_simulation_modifier_type(const char *idname,
const char *struct_name,
const int struct_size,
const int icon)
{
ModifierTypeInfo info{};
std::strncpy(info.idname, idname, sizeof(info.idname) - 1);
std::strncpy(info.name, idname, sizeof(info.name) - 1);
std::strncpy(info.struct_name, struct_name, sizeof(info.struct_name) - 1);
info.struct_size = struct_size;
info.srna = &RNA_Modifier;
info.type = ModifierTypeType::OnlyDeform;
info.flags = eModifierTypeFlag_AcceptsMesh;
info.icon = icon;
info.is_disabled = web_simulation_modifier_disabled;
return info;
}
ModifierTypeInfo modifierType_Softbody = web_simulation_modifier_type(
"Softbody", "SoftbodyModifierData", sizeof(SoftbodyModifierData), ICON_MOD_SOFT);
ModifierTypeInfo modifierType_Cloth = web_simulation_modifier_type(
"Cloth", "ClothModifierData", sizeof(ClothModifierData), ICON_MOD_CLOTH);
ModifierTypeInfo modifierType_Collision = web_simulation_modifier_type(
"Collision", "CollisionModifierData", sizeof(CollisionModifierData), ICON_MOD_PHYSICS);
#endif
void MOD_init_texture(MappingInfoModifierData *dmd, const ModifierEvalContext *ctx)
{
Tex *tex = dmd->texture;
@@ -227,6 +266,11 @@ void modifier_type_init(ModifierTypeInfo *types[])
INIT_TYPE(EdgeSplit);
INIT_TYPE(Armature);
INIT_TYPE(Hook);
/* These simulation modifiers remain metadata-only in the Web evaluator,
* but must retain their concrete DNA layouts when Main is serialized. */
INIT_TYPE(Softbody);
INIT_TYPE(Cloth);
INIT_TYPE(Collision);
INIT_TYPE(Boolean);
INIT_TYPE(MeshDeform);
INIT_TYPE(Nodes);