Commit: 0c0686bd1af148b051c62f55efe3948f17cef8ae Author: YimingWu Date: Sun Nov 15 11:07:21 2020 +0800 Branches: lanpr-under-gp https://developer.blender.org/rB0c0686bd1af148b051c62f55efe3948f17cef8ae
Merge branch 'master' into lanpr-under-gp # Conflicts: # release/datafiles/locale # release/scripts/addons # source/blender/blenloader/intern/versioning_290.c # source/blender/makesdna/DNA_gpencil_modifier_types.h # source/tools =================================================================== =================================================================== diff --cc source/blender/blenloader/intern/versioning_290.c index 1d0a0e67e25,ec39113c4d0..7f292f6fe15 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@@ -1138,15 -1152,18 +1152,27 @@@ void blo_do_versions_290(FileData *fd, * \note Keep this message at the bottom of the function. */ { + /* Keep this block, even when empty. */ + /* Initialize the opacity of the overlay wireframe */ + if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "wireframe_opacity")) { + for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { + if (sl->spacetype == SPACE_VIEW3D) { + View3D *v3d = (View3D *)sl; + v3d->overlay.wireframe_opacity = 1.0f; + } + } + } + + if (!DNA_struct_find(fd->filesdna, "SceneLineArt")) { + LISTBASE_FOREACH (Scene *, sc, &bmain->scenes) { + sc->lineart.crease_threshold = DEG2RAD(140.0f); + sc->lineart.line_types |= LRT_EDGE_FLAG_ALL_TYPE; + sc->lineart.flags |= (LRT_ALLOW_DUPLI_OBJECTS | LRT_REMOVE_DOUBLES); + sc->lineart.angle_splitting_threshold = DEG2RAD(60.0f); + sc->lineart.chaining_geometry_threshold = 0.001f; + sc->lineart.chaining_image_threshold = 0.001f; } } } diff --cc source/blender/makesrna/intern/rna_collection.c index 1d279496a64,20a455f5312..b0aa3ddfb54 --- a/source/blender/makesrna/intern/rna_collection.c +++ b/source/blender/makesrna/intern/rna_collection.c @@@ -496,36 -517,13 +521,38 @@@ void RNA_def_collections(BlenderRNA *br RNA_def_property_ui_text(prop, "Disable in Renders", "Globally disable in renders"); RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_Collection_flag_update"); + static const EnumPropertyItem rna_collection_lineart_usage[] = { + {COLLECTION_LRT_INCLUDE, "INCLUDE", 0, "Include", "Collection will produce feature lines"}, + {COLLECTION_LRT_OCCLUSION_ONLY, + "OCCLUSION_ONLY", + 0, + "Occlusion Only", + "Only use the collection to produce occlusion"}, + {COLLECTION_LRT_EXCLUDE, "EXCLUDE", 0, "Exclude", "Don't use this collection in LRT"}, + {COLLECTION_LRT_INTERSECTION_ONLY, + "INTERSECTION_ONLY", + 0, + "Intersection Only", + "Only generate intersection lines with this collection"}, + {COLLECTION_LRT_NO_INTERSECTION, + "NO_INTERSECTION", + 0, + "No Intersection", + "Do not generate intersection lines for this collection"}, + {0, NULL, 0, NULL, NULL}}; + + prop = RNA_def_property(srna, "lineart_usage", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, rna_collection_lineart_usage); + RNA_def_property_ui_text(prop, "Usage", "How to use this collection in LRT"); + RNA_def_property_update(prop, NC_SCENE, NULL); + prop = RNA_def_property(srna, "color_tag", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "color_tag"); + RNA_def_property_enum_funcs( + prop, "rna_Collection_color_tag_get", "rna_Collection_color_tag_set", NULL); RNA_def_property_enum_items(prop, rna_enum_collection_color_items); RNA_def_property_ui_text(prop, "Collection Color", "Color tag for a collection"); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_Collection_color_tag_update"); RNA_define_lib_overridable(false); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs