archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

safety NULL check for r51327, don't assume ED_object_modifier_add() succeeds.

Browse Source
This commit is contained in:
Campbell Barton
2012-10-15 03:56:01 +00:00
parent c483a54207
commit 0093ea2a79
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/object/object_relations.c
View File

@@ -679,21 +679,27 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
switch (partype) { switch (partype) {
case PAR_CURVE: /* curve deform */ case PAR_CURVE: /* curve deform */
if (modifiers_isDeformedByCurve(ob) != par) { if ( modifiers_isDeformedByCurve(ob) != par) {
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Curve); md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Curve);
((CurveModifierData *)md)->object = par; if (md) {
((CurveModifierData *)md)->object = par;
}
} }
break; break;
case PAR_LATTICE: /* lattice deform */ case PAR_LATTICE: /* lattice deform */
if (modifiers_isDeformedByLattice(ob) != par) { if (modifiers_isDeformedByLattice(ob) != par) {
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Lattice); md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Lattice);
((LatticeModifierData *)md)->object = par; if (md) {
((LatticeModifierData *)md)->object = par;
}
} }
break; break;
default: /* armature deform */ default: /* armature deform */
if (modifiers_isDeformedByArmature(ob) != par) { if (modifiers_isDeformedByArmature(ob) != par) {
md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Armature); md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Armature);
((ArmatureModifierData *)md)->object = par; if (md) {
((ArmatureModifierData *)md)->object = par;
}
} }
break; break;
} }