[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51332] trunk/blender/source/blender/ editors/object/object_relations.c: safety NULL check for r51327, don' t assume ED_object_modifier_add() succeeds.
Campbell Barton
ideasman42 at gmail.com
Mon Oct 15 05:56:02 CEST 2012
Revision: 51332
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51332
Author: campbellbarton
Date: 2012-10-15 03:56:01 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
safety NULL check for r51327, don't assume ED_object_modifier_add() succeeds.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51327
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_relations.c
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2012-10-15 03:52:27 UTC (rev 51331)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2012-10-15 03:56:01 UTC (rev 51332)
@@ -679,21 +679,27 @@
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;
}
More information about the Bf-blender-cvs
mailing list