[Bf-blender-cvs] [eae622d2ddf] blender2.8: Workspace: Call BKE_viewrender_free from the right place

Dalai Felinto noreply at git.blender.org
Mon Oct 16 21:54:14 CEST 2017


Commit: eae622d2ddf52e1755d16be570a950c5260da40b
Author: Dalai Felinto
Date:   Mon Oct 16 17:52:49 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBeae622d2ddf52e1755d16be570a950c5260da40b

Workspace: Call BKE_viewrender_free from the right place

We should call it when we free the workspace, not when removing it.
Patch by Julian Eisel.

===================================================================

M	source/blender/blenkernel/intern/workspace.c

===================================================================

diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 0747bde16d3..26df3a1ca8a 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -154,6 +154,7 @@ void BKE_workspace_free(WorkSpace *workspace)
 	}
 	BLI_freelistN(&workspace->layouts);
 	BLI_freelistN(&workspace->transform_orientations);
+	BKE_viewrender_free(&workspace->view_render);
 }
 
 void BKE_workspace_remove(Main *bmain, WorkSpace *workspace)
@@ -162,8 +163,6 @@ void BKE_workspace_remove(Main *bmain, WorkSpace *workspace)
 		layout_next = layout->next;
 		BKE_workspace_layout_remove(bmain, workspace, layout);
 	}
-
-	BKE_viewrender_free(&workspace->view_render);
 	BKE_libblock_free(bmain, workspace);
 }



More information about the Bf-blender-cvs mailing list