diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-09-10 10:05:18 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-09-10 10:05:18 +0400 |
commit | 46f0fbcf0aee50d978562158653a32d6d95b69fd (patch) | |
tree | c65183fcf566997e5ddf794d83e418c903220a78 | |
parent | cf4e32a06c84bdc3e735e4fccb693a400a8e4cbe (diff) |
Fix #23742: a NURBS surface created with two joined curves crashes Blender on rendering
Nurb's material number used to be clamped to [0;-1] for case object hasn't got
materials. Forced to keep material number on zero if object hasn't got any materials.
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index fd76c9e9350..7b9c6c7cc95 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -5577,7 +5577,9 @@ int join_curve_exec(bContext *C, wmOperator *op) nu= cu->nurb.first; while(nu) { newnu= duplicateNurb(nu); - CLAMP(newnu->mat_nr, 0, ob->totcol-1); /* TODO, merge material lists */ + if(ob->totcol) { /* TODO, merge material lists */ + CLAMP(newnu->mat_nr, 0, ob->totcol-1); + } else newnu->mat_nr= 0; BLI_addtail(&tempbase, newnu); if( (bezt= newnu->bezt) ) { |