blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix T102470: Make material LineArt properties animatable. 

MaterialLineArt didn't have a path func, now corrected.
This commit is contained in:
YimingWu 2022-11-25 23:15:05 +08:00 committed by Philipp Oeser
parent 9d3d9019ab
commit fff29e1bd6
Notes: blender-bot 2023-02-14 06:55:40 +01:00 
Referenced by issue #100749, Blender LTS: Maintenance Task 3.3
Referenced by issue #102470, LineArt mask in the material properties is marked as animatable but can't be animated
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_material.c
View File

@ -124,6 +124,11 @@ static void rna_MaterialLineArt_update(Main *UNUSED(bmain), Scene *UNUSED(scene)
WM_main_add_notifier(NC_MATERIAL | ND_SHADING_DRAW, ma);
}
static char *rna_MaterialLineArt_path(const PointerRNA *UNUSED(ptr))
{
return BLI_strdup("lineart");
}
static void rna_Material_draw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
{
Material *ma = (Material *)ptr->owner_id;
@ -731,6 +736,7 @@ static void rna_def_material_lineart(BlenderRNA *brna)
srna = RNA_def_struct(brna, "MaterialLineArt", NULL);
RNA_def_struct_sdna(srna, "MaterialLineArt");
RNA_def_struct_ui_text(srna, "Material Line Art", "");
RNA_def_struct_path_func(srna, "rna_MaterialLineArt_path");
prop = RNA_def_property(srna, "use_material_mask", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_default(prop, 0);

6
source/blender/makesrna/intern/rna_object.c
View File

@ -2241,6 +2241,11 @@ static void rna_object_lineart_update(Main *UNUSED(bmain), Scene *UNUSED(scene),
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ptr->owner_id);
}
static char *rna_ObjectLineArt_path(const PointerRNA *UNUSED(ptr))
{
return BLI_strdup("lineart");
}
static bool mesh_symmetry_get_common(PointerRNA *ptr, const eMeshSymmetryType sym)
{
const Object *ob = (Object *)ptr->owner_id;
@ -2939,6 +2944,7 @@ static void rna_def_object_lineart(BlenderRNA *brna)
srna = RNA_def_struct(brna, "ObjectLineArt", NULL);
RNA_def_struct_ui_text(srna, "Object Line Art", "Object line art settings");
RNA_def_struct_sdna(srna, "ObjectLineArt");
RNA_def_struct_path_func(srna, "rna_ObjectLineArt_path");
prop = RNA_def_property(srna, "usage", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, prop_feature_line_usage_items);