[Bf-blender-cvs] [7aa53f4] workspaces: Rename directory editors/screen/ to editors/workspace/
Julian Eisel
noreply at git.blender.org
Thu Jan 5 20:26:00 CET 2017
Commit: 7aa53f45202904152cdbbd1fd14a3ffc14456dd7
Author: Julian Eisel
Date: Thu Jan 5 20:17:07 2017 +0100
Branches: workspaces
https://developer.blender.org/rB7aa53f45202904152cdbbd1fd14a3ffc14456dd7
Rename directory editors/screen/ to editors/workspace/
Screen is now considered lower level as workspaces, so screen files should rather be in a folder called 'workspace' instead of having workspace files in a 'screen' directory.
Also corrected doxygen info for editors/scene/.
===================================================================
M build_files/cmake/macros.cmake
M doc/doxygen/doxygen.source.h
M source/blender/editors/CMakeLists.txt
M source/blender/editors/scene/scene_edit.c
R095 source/blender/editors/screen/CMakeLists.txt source/blender/editors/workspace/CMakeLists.txt
R099 source/blender/editors/screen/area.c source/blender/editors/workspace/area.c
R099 source/blender/editors/screen/glutil.c source/blender/editors/workspace/glutil.c
R099 source/blender/editors/screen/screen_context.c source/blender/editors/workspace/screen_context.c
R099 source/blender/editors/screen/screen_draw.c source/blender/editors/workspace/screen_draw.c
A source/blender/editors/workspace/screen_draw.c.orig
R099 source/blender/editors/screen/screen_edit.c source/blender/editors/workspace/screen_edit.c
A source/blender/editors/workspace/screen_edit.c.orig
R097 source/blender/editors/screen/screen_intern.h source/blender/editors/workspace/screen_intern.h
A source/blender/editors/workspace/screen_intern.h.orig
R099 source/blender/editors/screen/screen_ops.c source/blender/editors/workspace/screen_ops.c
R099 source/blender/editors/screen/screendump.c source/blender/editors/workspace/screendump.c
R098 source/blender/editors/screen/workspace_edit.c source/blender/editors/workspace/workspace_edit.c
R098 source/blender/editors/screen/workspace_layout_edit.c source/blender/editors/workspace/workspace_layout_edit.c
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index a455bf4..40be874 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -587,9 +587,9 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_editor_physics
bf_editor_render
bf_editor_scene
- bf_editor_screen
bf_editor_sculpt_paint
bf_editor_sound
+ bf_editor_workspace
bf_editor_animation
bf_editor_datafiles
bf_editor_mask
diff --git a/doc/doxygen/doxygen.source.h b/doc/doxygen/doxygen.source.h
index 3ef2046..a91469d 100644
--- a/doc/doxygen/doxygen.source.h
+++ b/doc/doxygen/doxygen.source.h
@@ -219,7 +219,7 @@
* \ingroup editors
*/
-/** \defgroup edscr screen
+/** \defgroup edscene scene
* \ingroup editors
*/
@@ -231,6 +231,10 @@
* \ingroup editors
*/
+/** \defgroup edworkspace workspace
+ * \ingroup editors
+ */
+
/** \defgroup spaction action space
* \ingroup editors
*/
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 3881621..78716c8 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -36,7 +36,6 @@ if(WITH_BLENDER)
add_subdirectory(physics)
add_subdirectory(render)
add_subdirectory(scene)
- add_subdirectory(screen)
add_subdirectory(sculpt_paint)
add_subdirectory(sound)
add_subdirectory(space_action)
@@ -61,6 +60,7 @@ if(WITH_BLENDER)
add_subdirectory(transform)
add_subdirectory(util)
add_subdirectory(uvedit)
+ add_subdirectory(workspace)
endif()
add_subdirectory(datafiles)
diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c
index b3e6764..35cfba2 100644
--- a/source/blender/editors/scene/scene_edit.c
+++ b/source/blender/editors/scene/scene_edit.c
@@ -18,8 +18,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/screen/scene_edit.c
- * \ingroup edscr
+/** \file blender/editors/scene/scene_edit.c
+ * \ingroup edscene
*/
#include "BKE_context.h"
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/workspace/CMakeLists.txt
similarity index 95%
rename from source/blender/editors/screen/CMakeLists.txt
rename to source/blender/editors/workspace/CMakeLists.txt
index d7aaf58..15f74f4 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/workspace/CMakeLists.txt
@@ -58,4 +58,4 @@ endif()
add_definitions(${GL_DEFINITIONS})
-blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_workspace "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/workspace/area.c
similarity index 99%
rename from source/blender/editors/screen/area.c
rename to source/blender/editors/workspace/area.c
index 70b769e..0c760ea 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/workspace/area.c
@@ -24,8 +24,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/screen/area.c
- * \ingroup edscr
+/** \file blender/editors/workspace/area.c
+ * \ingroup edworkspace
*/
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/workspace/glutil.c
similarity index 99%
rename from source/blender/editors/screen/glutil.c
rename to source/blender/editors/workspace/glutil.c
index 4759325..75d155a 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/workspace/glutil.c
@@ -23,8 +23,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/screen/glutil.c
- * \ingroup edscr
+/** \file blender/editors/workspace/glutil.c
+ * \ingroup workspace
*/
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/workspace/screen_context.c
similarity index 99%
rename from source/blender/editors/screen/screen_context.c
rename to source/blender/editors/workspace/screen_context.c
index 4900d17..1bcd15a 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/workspace/screen_context.c
@@ -22,8 +22,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/screen/screen_context.c
- * \ingroup edscr
+/** \file blender/editors/workspace/screen_context.c
+ * \ingroup edworkspace
*/
#include <stdio.h>
diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/workspace/screen_draw.c
similarity index 99%
copy from source/blender/editors/screen/screen_draw.c
copy to source/blender/editors/workspace/screen_draw.c
index c7c91ad..c275008 100644
--- a/source/blender/editors/screen/screen_draw.c
+++ b/source/blender/editors/workspace/screen_draw.c
@@ -18,8 +18,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/screen/screen_draw.c
- * \ingroup edscr
+/** \file blender/editors/workspace/screen_draw.c
+ * \ingroup edworkspace
*/
#include "ED_screen.h"
diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/workspace/screen_draw.c.orig
similarity index 96%
rename from source/blender/editors/screen/screen_draw.c
rename to source/blender/editors/workspace/screen_draw.c.orig
index c7c91ad..55863a1 100644
--- a/source/blender/editors/screen/screen_draw.c
+++ b/source/blender/editors/workspace/screen_draw.c.orig
@@ -259,7 +259,10 @@ static void drawscredge_area(ScrArea *sa, int sizex, int sizey)
*/
void ED_screen_draw(wmWindow *win)
{
+<<<<<<< HEAD
bScreen *screen = WM_window_get_active_screen(win);
+=======
+>>>>>>> blender2.8
const int winsize_x = WM_window_pixels_x(win);
const int winsize_y = WM_window_pixels_y(win);
@@ -268,7 +271,11 @@ void ED_screen_draw(wmWindow *win)
ScrArea *sa2 = NULL;
ScrArea *sa3 = NULL;
+<<<<<<< HEAD
wmSubWindowSet(win, screen->mainwin);
+=======
+ wmSubWindowSet(win, win->screen->mainwin);
+>>>>>>> blender2.8
/* Note: first loop only draws if U.pixelsize > 1, skip otherwise */
if (U.pixelsize > 1.0f) {
@@ -276,7 +283,11 @@ void ED_screen_draw(wmWindow *win)
glLineWidth((2.0f * U.pixelsize) - 1);
glColor3ub(0x50, 0x50, 0x50);
glBegin(GL_LINES);
+<<<<<<< HEAD
for (sa = screen->areabase.first; sa; sa = sa->next)
+=======
+ for (sa = win->screen->areabase.first; sa; sa = sa->next)
+>>>>>>> blender2.8
drawscredge_area(sa, winsize_x, winsize_y);
glEnd();
}
@@ -284,7 +295,11 @@ void ED_screen_draw(wmWindow *win)
glLineWidth(1);
glColor3ub(0, 0, 0);
glBegin(GL_LINES);
+<<<<<<< HEAD
for (sa = screen->areabase.first; sa; sa = sa->next) {
+=======
+ for (sa = win->screen->areabase.first; sa; sa = sa->next) {
+>>>>>>> blender2.8
drawscredge_area(sa, winsize_x, winsize_y);
/* gather area split/join info */
@@ -348,7 +363,11 @@ void ED_screen_draw(wmWindow *win)
glDisable(GL_BLEND);
}
+<<<<<<< HEAD
screen->do_draw = false;
+=======
+ win->screen->do_draw = false;
+>>>>>>> blender2.8
}
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/workspace/screen_edit.c
similarity index 99%
copy from source/blender/editors/screen/screen_edit.c
copy to source/blender/editors/workspace/screen_edit.c
index 720da7f..432a4c1 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/workspace/screen_edit.c
@@ -22,8 +22,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/screen/screen_edit.c
- * \ingroup edscr
+/** \file blender/editors/workspace/screen_edit.c
+ * \ingroup edworkspace
*/
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/workspace/screen_edit.c.orig
similarity index 94%
rename from source/blender/editors/screen/screen_edit.c
rename to source/blender/editors/workspace/screen_edit.c.orig
index 720da7f..52a17ca 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/workspace/screen_edit.c.orig
@@ -51,7 +51,10 @@
#include "BKE_node.h"
#include "BKE_screen.h"
#include "BKE_scene.h"
+<<<<<<< HEAD
#include "BKE_workspace.h"
+=======
+>>>>>>> blender2.8
#include "WM_api.h"
#include "WM_types.h"
@@ -533,29 +536,13 @@ void screen_data_copy(bScreen *to, bScreen *from)
/**
* Prepare a newly created screen for initializing it as active screen.
*/
-void screen_new_activate_prepare(const wmWindow *win, bScreen *screen_new)
+void screen_new_activate_refresh(const wmWindow *win, bScreen *screen_new)
{
screen_new->winid = win->winid;
screen_new->do_refresh = true;
screen_new->do_draw = true;
}
-void screen_changed_update(bContext *C, wmWindow *win, bScreen *sc)
-{
- Scene *scene = WM_window_get_active_scene(win);
-
- CTX_wm_window_set(C, win); /* stores C->wm.screen... hrmf */
-
- ED_screen_refresh(CTX_wm_manager(C), win);
-
- BKE_screen_view3d_scene_sync(sc, scene); /* sync new screen with scene data */
- WM_event_add_notifier(C, NC_WINDOW, NULL);
- WM_event_add_notifier(C, NC_WORKSPACE | ND_SCREENSET, sc);
-
- /* makes button hilites work */
- WM_event_add_mousemove(C);
-}
-
/* with sa as center, sb is located at: 0=W, 1=N, 2=E, 3=S */
/* -1 = not valid check */
@@ -962,8 +949,6 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
printf("%s: set screen\n", __func__);
}
screen->do_refresh = false;
- /* prevent multiwin errors */
- screen->winid = win->winid;
screen->context = ed_screen_context;
}
@@ -974,8 +959,8 @@ void ED_screens_initialize(wmWindowManager *wm)
wmWindow *win;
for (win = wm->windows.first; win; win = win->next) {
- if (WM_window_get_active_workspace(win) == NULL) {
- WM_window_set_active_workspace(win, G.main->workspaces.first);
+ if (win->workspace == NULL) {
+ win->workspace = G.main->workspaces.first;
}
ED_screen_refresh(wm, win);
@@ -1209,7 +1194,7 @@ int ED_screen_area_active(const bContext *C)
/* -------------------------------------------------------------------- */
/* Screen Activation (screen_set_xxx) */
-static bScreen *screen_find_associated_fullscreen(const Main *bmain, bScreen *screen)
+bScreen *screen_set_find_associated_fullscreen(const Main *bmain, bScreen *screen)
{
for (bScreen *screen_iter = bmain->screen.first; screen_iter; screen_iter = screen_iter->id.next) {
ScrArea *sa = screen_iter->areabase.fir
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list