blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix T52136: Blender segfault (stack overflow most certainly) when converting to mesh. 

Stupid mistake in own recent refactor.
This commit is contained in:
Bastien Montagne 2017-07-21 10:24:20 +02:00
parent dc6fcb8ecf
commit 8b17ec0c00
Notes: blender-bot 2023-02-14 11:29:52 +01:00 
Referenced by issue #52143, windows broken by latest commits
Referenced by issue #52136, Blender segfault (stack overflow most certainly) when converting to mesh
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_add.c
View File

@ -1682,7 +1682,7 @@ static int convert_exec(bContext *C, wmOperator *op)
* However, changing this is more design than bugfix, not to mention convoluted code below,
* so that will be for later.
* But at the very least, do not do that with linked IDs! */
if ((ID_IS_LINKED_DATABLOCK(ob) || ID_IS_LINKED_DATABLOCK(ob->data)) && !keep_original) {
if ((ID_IS_LINKED_DATABLOCK(ob) || (ob->data && ID_IS_LINKED_DATABLOCK(ob->data))) && !keep_original) {
keep_original = true;
BKE_reportf(op->reports, RPT_INFO,
"Converting some linked object/object data, enforcing 'Keep Original' option to True");