griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-06-19 10:34:11 +10:00
parent 0a22fbc153 41bf2f598f
commit 37fe1b9b8d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/properties.py
View File

@@ -364,7 +364,7 @@ def update_render_engine(self, context):
def update_world(self, context): def update_world(self, context):
# Force a depsgraph update, because add-on properties dont. # Force a depsgraph update, because add-on properties don't.
# (at least not from the UI, see #138071) # (at least not from the UI, see #138071)
context.scene.world.update_tag() context.scene.world.update_tag()

2
source/blender/editors/object/object_constraint.cc
View File

@@ -2341,7 +2341,7 @@ static wmOperatorStatus constraint_add_exec(
/* get the target objects, adding them as need be */ /* get the target objects, adding them as need be */
if (get_new_constraint_target(C, type, &tar_ob, &tar_pchan, true)) { if (get_new_constraint_target(C, type, &tar_ob, &tar_pchan, true)) {
/* Armature constraints dont have a target by default, add one. */ /* Armature constraints don't have a target by default, add one. */
if (type == CONSTRAINT_TYPE_ARMATURE) { if (type == CONSTRAINT_TYPE_ARMATURE) {
bArmatureConstraint *acon = static_cast<bArmatureConstraint *>(con->data); bArmatureConstraint *acon = static_cast<bArmatureConstraint *>(con->data);
bConstraintTarget *ct = MEM_callocN<bConstraintTarget>("Constraint Target"); bConstraintTarget *ct = MEM_callocN<bConstraintTarget>("Constraint Target");

2
tools/utils/git_log_review_commits_advanced.py
View File

@@ -472,7 +472,7 @@ def write_release_log(path, release_log, c, cat, rstate, rstate_list):
"branch), only fixes of issues which already existed in previous official releases are " "branch), only fixes of issues which already existed in previous official releases are "
"listed here. Fixes for regressions introduced since last release, or for new " "listed here. Fixes for regressions introduced since last release, or for new "
"features, are '''not''' listed here.<br/>For following RCs and final release, " "features, are '''not''' listed here.<br/>For following RCs and final release, "
"'''all''' backported fixes are listed.}}", IGNORE_END_LINE)) "'''all''' back-ported fixes are listed.}}", IGNORE_END_LINE))
f.write("\n".join(lines)) f.write("\n".join(lines))
f.write("\n") f.write("\n")