blender
/
blender
134
425
Fork 607
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

WIP: Fix #116458: Added decay factor for flattening brushes. #118699

Draft
Raul Fernandez Hernandez wants to merge 87 commits from farsthary/blender:Fix-#116458-Sculpt-Clay-strip-sculpts-on-back-face-when-front-face-only-is-turned-on into blender-v4.1-release
pull from: farsthary/blender:Fix-#116458-Sculpt-Clay-strip-sculpts-on-back-face-when-front-face-only-is-turned-on
merge into: blender:blender-v4.1-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 16 Commits 87 Files Changed 9 +6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae91868f12 - Show all commits

6
source/blender/io/collada/ArmatureImporter.cpp
View File

@ -476,6 +476,12 @@ void ArmatureImporter::create_armature_bones(Main *bmain, std::vector<Object *>
continue;
}
/* Assumption that joint_parent_map only lists armatures is apparently wrong (it can be meshes,
* too), this needs to be checked again, for now prevent a crash though. */
if (ob_arm->type != OB_ARMATURE) {
continue;
}
bArmature *armature = (bArmature *)ob_arm->data;
if (!armature) {
continue;