Commit: 5ec9754286a89c99f1d7e6d2419374ad1d1b2659
Author: Julian Eisel
Date: Fri Apr 7 16:30:18 2017 +0200
Branches: workspaces
https://developer.blender.org/rB5ec9754286a89c99f1d7e6d2419374ad1d1b2659
Merge branch 'blender2.8' into workspaces
Conflicts:
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/screen/screen_edit.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/library_remap.c
index b5f795545c7,1f146ece690..1e0ab549c84
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@@ -107,9 -106,11 +106,12 @@@
#include "BKE_scene.h"
#include "BKE_text.h"
#include "BKE_texture.h"
+#include "BKE_workspace.h"
#include "BKE_world.h"
+ #include "DEG_depsgraph.h"
+ #include "DEG_depsgraph_build.h"
+
#ifdef WITH_PYTHON
#include "BPY_extern.h"
#endif
diff --cc source/blender/blenloader/intern/readfile.c
index cd650ef8bdd,08f2c56e0ad..d31a6d84b88
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -151,8 -148,9 +150,10 @@@
#include "BKE_outliner_treehash.h"
#include "BKE_sound.h"
#include "BKE_colortools.h"
+#include "BKE_workspace.h"
+ #include "DEG_depsgraph.h"
+
#include "NOD_common.h"
#include "NOD_socket.h"
diff --cc source/blender/editors/screen/screen_draw.c
index de757078ade,31acaecf029..faf0234932d
--- a/source/blender/editors/screen/screen_draw.c
+++ b/source/blender/editors/screen/screen_draw.c
@@@ -302,9 -301,9 +302,9 @@@ void ED_screen_draw(wmWindow *win
ScrArea *sa2 = NULL;
ScrArea *sa3 = NULL;
- wmSubWindowSet(win, win->screen->mainwin);
+ wmSubWindowSet(win, screen->mainwin);
- unsigned int pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2,
KEEP_FLOAT);
+ unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos",
COMP_F32, 2, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* Note: first loop only draws if U.pixelsize > 1, skip otherwise */
diff --cc source/blender/editors/space_view3d/space_view3d.c
index 302d5a5540f,af25c9de781..f5266c1f3ce
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -812,11 -829,13 +830,13 @@@ static void view3d_recalc_used_layers(A
}
}
-static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion
*ar, wmNotifier *wmn)
+static void view3d_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa,
ARegion *ar,
+ wmNotifier *wmn, const Scene *scene)
{
- Scene *scene = sc->scene;
View3D *v3d = sa->spacedata.first;
-
+ RegionView3D *rv3d = ar->regiondata;
+ wmManipulatorMap *mmap = ar->manipulator_map;
+
/* context changes */
switch (wmn->category) {
case NC_ANIMATION:
@@@ -842,13 -861,8 +862,14 @@@
if (wmn->reference)
view3d_recalc_used_layers(ar,
wmn, wmn->reference);
ED_region_tag_redraw(ar);
+ WM_manipulatormap_tag_refresh(mmap);
break;
+ case ND_LAYER:
+ if (wmn->reference) {
+ BKE_screen_view3d_sync(v3d,
wmn->reference);
+ }
+ ED_region_tag_redraw(ar);
+ break;
case ND_FRAME:
case ND_TRANSFORM:
case ND_OB_ACTIVE:
@@@ -1027,13 -1044,12 +1051,14 @@@
/* screen was changed, need to update
used layers due to NC_SCENE|ND_LAYER_CONTENT */
/* updates used layers only for View3D
in active screen */
if (wmn->reference) {
- bScreen *sc_ref =
wmn->reference;
- view3d_recalc_used_layers(ar,
wmn, sc_ref->scene);
+ view3d_recalc_used_layers(ar,
wmn, scene);
}
+ WM_manipulatormap_tag_refresh(mmap);
ED_region_tag_redraw(ar);
break;
+ case ND_LAYER:
+ ED_region_tag_redraw(ar);
+ break;
}
break;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
