[Bf-blender-cvs] [f6ceeea] workspaces: Fix compile error and warning in release builds
Julian Eisel
noreply at git.blender.org
Fri Jan 6 01:19:05 CET 2017
Commit: f6ceeea4f73c4302d77ca06bf8dcd819c157519f
Author: Julian Eisel
Date: Fri Jan 6 01:18:34 2017 +0100
Branches: workspaces
https://developer.blender.org/rBf6ceeea4f73c4302d77ca06bf8dcd819c157519f
Fix compile error and warning in release builds
===================================================================
M source/blender/blenkernel/intern/workspace.c
M source/blender/editors/scene/scene_edit.c
===================================================================
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 1703326..6a4d36d 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -41,7 +41,7 @@
#include "MEM_guardedalloc.h"
-static bool workspaces_is_screen_used(const Main *bmain, bScreen *screen);
+bool workspaces_is_screen_used(const Main *bmain, bScreen *screen);
/* -------------------------------------------------------------------- */
@@ -120,7 +120,7 @@ void BKE_workspaces_transform_orientation_remove(const ListBase *workspaces, con
* WorkSpaceLayouts, but that should be ensured outside of the BKE_workspace module and without such checks.
* Hence, this should only be used as assert check before assigining a screen to a workflow.
*/
-static bool workspaces_is_screen_used(const Main *bmain, bScreen *screen)
+bool workspaces_is_screen_used(const Main *bmain, bScreen *screen)
{
for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
if (BKE_workspace_layout_find_exec(workspace, screen)) {
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c
index de43141..015cd5d 100644
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@@ -22,6 +22,8 @@
* \ingroup edscene
*/
+#include <stdio.h>
+
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
More information about the Bf-blender-cvs
mailing list