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

1 files changed, 10 insertions, 4 deletions

diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index b7efe9189d8..447ba29e203 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -679,21 +679,27 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
 					
 					switch (partype) {
 						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);
-								((CurveModifierData *)md)->object = par;
+								if (md) {
+									((CurveModifierData *)md)->object = par;
+								}
 							}
 							break;
 						case PAR_LATTICE: /* lattice deform */
 							if (modifiers_isDeformedByLattice(ob) != par) {
 								md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Lattice);
-								((LatticeModifierData *)md)->object = par;
+								if (md) {
+									((LatticeModifierData *)md)->object = par;
+								}
 							}
 							break;
 						default: /* armature deform */
 							if (modifiers_isDeformedByArmature(ob) != par) {
 								md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Armature);
-								((ArmatureModifierData *)md)->object = par;
+								if (md) {
+									((ArmatureModifierData *)md)->object = par;
+								}
 							}
 							break;
 					}