Fix #22694: rendering exits editmode. Problem was due to incorrect fix for
bug #20091 in revision 24989, crash when rendering in metaball editmode.
This commit is contained in:
@@ -60,6 +60,10 @@
|
||||
/* This function is used to free all MetaElems from MetaBall */
|
||||
void free_editMball(Object *obedit)
|
||||
{
|
||||
MetaBall *mb = (MetaBall*)obedit->data;
|
||||
|
||||
mb->editelems= NULL;
|
||||
mb->lastelem= NULL;
|
||||
}
|
||||
|
||||
/* This function is called, when MetaBall Object is
|
||||
@@ -84,10 +88,6 @@ void make_editMball(Object *obedit)
|
||||
* from object->data->edit_elems to object->data->elems. */
|
||||
void load_editMball(Object *obedit)
|
||||
{
|
||||
MetaBall *mb = (MetaBall*)obedit->data;
|
||||
|
||||
mb->editelems= NULL;
|
||||
mb->lastelem= NULL;
|
||||
}
|
||||
|
||||
/* Add metaelem primitive to metaball object (which is in edit mode) */
|
||||
|
||||
@@ -637,7 +637,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
|
||||
multires_force_render_update(CTX_data_active_object(C));
|
||||
|
||||
/* get editmode results */
|
||||
ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO); /* 0 = does not exit editmode */
|
||||
ED_object_exit_editmode(C, 0); /* 0 = does not exit editmode */
|
||||
|
||||
// store spare
|
||||
// get view3d layer, local layer, make this nice api call to render
|
||||
|
||||
Reference in New Issue
Block a user