forked from bartvdbraak/blender
Merge branch 'blender-v3.5-release'
This commit is contained in:
commit
74070a1c2c
@ -322,6 +322,11 @@ def external_script_initialize_if_needed(args: argparse.Namespace,
|
|||||||
blender_url = make_utils.git_get_remote_url(args.git_command, origin_name)
|
blender_url = make_utils.git_get_remote_url(args.git_command, origin_name)
|
||||||
external_url = resolve_external_url(blender_url, repo_name)
|
external_url = resolve_external_url(blender_url, repo_name)
|
||||||
|
|
||||||
|
# When running `make update` from a freshly cloned fork check whether the fork of the submodule is
|
||||||
|
# available, If not, switch to the submodule relative to the main blender repository.
|
||||||
|
if origin_name == "origin" and not make_utils.git_is_remote_repository(args.git_command, external_url):
|
||||||
|
external_url = resolve_external_url("https://projects.blender.org/blender/blender", repo_name)
|
||||||
|
|
||||||
call((args.git_command, "clone", "--origin", origin_name, external_url, str(external_dir)))
|
call((args.git_command, "clone", "--origin", origin_name, external_url, str(external_dir)))
|
||||||
|
|
||||||
|
|
||||||
|
@ -330,10 +330,10 @@
|
|||||||
.edge_types = LRT_EDGE_FLAG_INIT_TYPE, \
|
.edge_types = LRT_EDGE_FLAG_INIT_TYPE, \
|
||||||
.thickness = 25, \
|
.thickness = 25, \
|
||||||
.opacity = 1.0f, \
|
.opacity = 1.0f, \
|
||||||
.flags = LRT_GPENCIL_MATCH_OUTPUT_VGROUP, \
|
|
||||||
.crease_threshold = DEG2RAD(140.0f), \
|
.crease_threshold = DEG2RAD(140.0f), \
|
||||||
.calculation_flags = LRT_ALLOW_DUPLI_OBJECTS | LRT_ALLOW_CLIPPING_BOUNDARIES | \
|
.calculation_flags = LRT_ALLOW_DUPLI_OBJECTS | LRT_ALLOW_CLIPPING_BOUNDARIES | \
|
||||||
LRT_USE_CREASE_ON_SHARP_EDGES | LRT_FILTER_FACE_MARK_KEEP_CONTOUR, \
|
LRT_USE_CREASE_ON_SHARP_EDGES | LRT_FILTER_FACE_MARK_KEEP_CONTOUR | \
|
||||||
|
LRT_GPENCIL_MATCH_OUTPUT_VGROUP, \
|
||||||
/* Do not split by default, this is for better chaining quality. */ \
|
/* Do not split by default, this is for better chaining quality. */ \
|
||||||
.angle_splitting_threshold = 0.0f, \
|
.angle_splitting_threshold = 0.0f, \
|
||||||
.chaining_image_threshold = 0.001f, \
|
.chaining_image_threshold = 0.001f, \
|
||||||
|
Loading…
Reference in New Issue
Block a user