Commit: 94aa4d16579defae126f6cb3986cf06b5969d0e7
Author: Bastien Montagne
Date: Fri Jun 8 14:38:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB94aa4d16579defae126f6cb3986cf06b5969d0e7
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/curve/editcurve_paint.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/gpencil/gpencil_utils.c
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/interface/interface_eyedropper_depth.c
source/blender/editors/render/render_opengl.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_utils.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/python/intern/gpu_offscreen.c
source/blender/windowmanager/intern/wm_files.c
===================================================================
===================================================================
diff --cc source/blender/editors/curve/editcurve.c
index b6007ca5e18,b0efc2ddc50..616017dac0a
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@@ -5026,16 -5009,17 +5026,16 @@@ static int add_vertex_invoke(bContext *
const float mval[2] = {UNPACK2(event->mval)};
struct SnapObjectContext *snap_context =
ED_transform_snap_object_context_create_view3d(
- vc.scene, CTX_data_depsgraph(C), 0, vc.ar,
vc.v3d);
- CTX_data_main(C), vc.scene, 0,
- vc.ar, vc.v3d);
++ vc.bmain, vc.scene, vc.depsgraph, 0, vc.ar,
vc.v3d);
- ED_transform_snap_object_project_view3d_mixed(
+ ED_transform_snap_object_project_view3d(
snap_context,
- SCE_SELECT_FACE,
+ SCE_SNAP_MODE_FACE,
&(const struct SnapObjectParams){
- .snap_select = (vc.scene->obedit != NULL) ?
SNAP_NOT_ACTIVE : SNAP_ALL,
+ .snap_select = (vc.obedit != NULL) ?
SNAP_NOT_ACTIVE : SNAP_ALL,
.use_object_edit_cage = false,
},
- mval, NULL, true,
+ mval, NULL,
location, NULL);
diff --cc source/blender/editors/curve/editcurve_paint.c
index e6f5f82f96a,325c39d7f38..887f3dd13da
--- a/source/blender/editors/curve/editcurve_paint.c
+++ b/source/blender/editors/curve/editcurve_paint.c
@@@ -33,11 -33,11 +33,12 @@@
#include "BKE_context.h"
#include "BKE_curve.h"
-#include "BKE_depsgraph.h"
#include "BKE_fcurve.h"
+ #include "BKE_main.h"
#include "BKE_report.h"
+#include "DEG_depsgraph.h"
+
#include "WM_api.h"
#include "WM_types.h"
@@@ -616,9 -590,8 +617,10 @@@ static bool curve_draw_init(bContext *C
}
}
else {
+ cdd->vc.bmain = CTX_data_main(C);
+ cdd->vc.depsgraph = CTX_data_depsgraph(C);
cdd->vc.scene = CTX_data_scene(C);
+ cdd->vc.view_layer = CTX_data_view_layer(C);
cdd->vc.obedit = CTX_data_edit_object(C);
}
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 431c087d42c,0d4c8e383de..437d5cef6f8
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -115,8 -112,8 +116,9 @@@ typedef enum eGPencil_PaintFlags
* "p" = op->customdata
*/
typedef struct tGPsdata {
+ Main *bmain;
Scene *scene; /* current scene from context */
+ struct Depsgraph *depsgraph;
wmWindow *win; /* window where painting originated */
ScrArea *sa; /* area where painting originated */
@@@ -1399,8 -1395,8 +1401,9 @@@ static bool gp_session_initdata(bContex
}
/* pass on current scene and window */
+ p->bmain = CTX_data_main(C);
p->scene = CTX_data_scene(C);
+ p->depsgraph = CTX_data_depsgraph(C);
p->win = CTX_wm_window(C);
unit_m4(p->imat);
diff --cc source/blender/editors/include/ED_object.h
index 3ffab756319,ade68de6d24..71b713da0d0
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@@ -151,8 -140,7 +151,8 @@@ void ED_object_wpaintmode_exit_ex(struc
void ED_object_wpaintmode_exit(struct bContext *C);
void ED_object_sculptmode_enter_ex(
- struct Depsgraph *depsgraph,
- struct Main *bmain, struct Scene *scene, struct Object *ob,
++ struct Main *bmain, struct Depsgraph *depsgraph,
+ struct Scene *scene, struct Object *ob,
struct ReportList *reports);
void ED_object_sculptmode_enter(struct bContext *C, struct ReportList
*reports);
void ED_object_sculptmode_exit_ex(
diff --cc source/blender/editors/include/ED_transform_snap_object_context.h
index 18d5101ebf7,c20d92963a9..8ac7dfcf9d8
--- a/source/blender/editors/include/ED_transform_snap_object_context.h
+++ b/source/blender/editors/include/ED_transform_snap_object_context.h
@@@ -79,9 -73,9 +79,9 @@@ struct SnapObjectParams
typedef struct SnapObjectContext SnapObjectContext;
SnapObjectContext *ED_transform_snap_object_context_create(
- struct Scene *scene, struct Depsgraph *depsgraph, int flag);
- struct Main *bmain, struct Scene *scene, int flag);
++ struct Main *bmain, struct Scene *scene, struct Depsgraph *depsgraph,
int flag);
SnapObjectContext *ED_transform_snap_object_context_create_view3d(
- struct Scene *scene, struct Depsgraph *depsgraph, int flag,
- struct Main *bmain, struct Scene *scene, int flag,
++ struct Main *bmain, struct Scene *scene, struct Depsgraph *depsgraph,
int flag,
/* extra args for view3d */
const struct ARegion *ar, const struct View3D *v3d);
void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx);
diff --cc source/blender/editors/include/ED_view3d.h
index f00982d4102,b1b1c5d1612..24e5b3e2662
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -75,9 -70,8 +75,10 @@@ enum eGPUFXFlags
/* for derivedmesh drawing callbacks, for view3d_select, .... */
typedef struct ViewContext {
+ struct Main *bmain;
+ struct Depsgraph *depsgraph;
struct Scene *scene;
+ struct ViewLayer *view_layer;
struct Object *obact;
struct Object *obedit;
struct ARegion *ar;
@@@ -331,7 -304,7 +332,8 @@@ bool ED_view3d_autodist
const bool alphaoverride, const float fallback_depth_pt[3]);
/* only draw so ED_view3d_autodist_simple can be called many times after */
- void ED_view3d_autodist_init(struct Depsgraph *depsgraph, struct ARegion *ar,
struct View3D *v3d, int mode);
-void ED_view3d_autodist_init(struct Main *bmain, struct Scene *scene, struct
ARegion *ar, struct View3D *v3d, int mode);
++void ED_view3d_autodist_init(
++ struct Depsgraph *depsgraph, struct ARegion *ar, struct View3D *v3d,
int mode);
bool ED_view3d_autodist_simple(struct ARegion *ar, const int mval[2], float
mouse_worldloc[3], int margin, float *force_depth);
bool ED_view3d_autodist_depth(struct ARegion *ar, const int mval[2], int
margin, float *depth);
bool ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2],
const int mval_end[2], int margin, float *depth);
diff --cc source/blender/editors/include/UI_interface.h
index ee1c4b30eef,0fd253e9fec..a283068853c
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -860,8 -807,9 +860,8 @@@ void UI_popup_handlers_remove_all(struc
* be used to reinitialize some internal state if user preferences change. */
void UI_init(void);
- void UI_init_userdef(void);
+ void UI_init_userdef(struct Main *bmain);
void UI_reinit_font(void);
-void UI_reinit_gl_state(void);
void UI_exit(void);
/* Layout
diff --cc source/blender/editors/interface/interface.c
index 6cb667cb9a8,895190ab885..28f4c40469a
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -51,15 -50,14 +51,16 @@@
#include "BLI_utildefines.h"
+#include "BKE_animsys.h"
#include "BKE_context.h"
- #include "BKE_unit.h"
+ #include "BKE_idprop.h"
+ #include "BKE_main.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
- #include "BKE_idprop.h"
+ #include "BKE_unit.h"
-#include "BIF_gl.h"
+#include "GPU_glew.h"
+#include "GPU_matrix.h"
#include "BLF_api.h"
#include "BLT_translation.h"
diff --cc source/blender/editors/mesh/editmesh_tools.c
index 5c6b6da54a6,0625ebe6dd6..17f643636cf
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@@ -359,6 -314,6 +359,7 @@@ void MESH_OT_unsubdivide(wmOperatorTyp
void EMBM_project_snap_verts(bContext *C, ARegion *ar, BMEditMesh *em)
{
++ Main *bmain = CTX_data_main(C);
Object *obedit = em->ob;
BMIter iter;
BMVert *eve;
@@@ -366,7 -321,7 +367,7 @@@
ED_view3d_init_mats_rv3d(obedit, ar->regiondata);
struct SnapObjectContext *snap_context =
ED_transform_snap_object_context_create_view3d(
- CTX_data_scene(C), CTX_data_depsgraph(C), 0,
- CTX_data_main(C), CTX_data_scene(C), 0,
++ bmain, CTX_data_scene(C), CTX_data_depsgraph(C), 0,
ar, CTX_wm_view3d(C));
BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 70a8c725284,d5bdd4c8b98..a59e2abdb5f
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -5643,8 -5630,7 +5643,8 @@@ static int ed_object_sculptmode_flush_r
}
void ED_object_sculptmode_enter_ex(
- Depsgraph *depsgraph,
- Main *bmain, Scene *scene, Object *ob,
++ Main *bmain, Depsgraph *depsgraph,
+ Scene *scene, Object *ob,
ReportList *reports)
{
const int mode_flag = OB_MODE_SCULPT;
@@@ -5751,10 -5730,10 +5751,11 @@@
void ED_object_sculptmode_enter(struct bContext *C, ReportList *reports)
{
+ Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
- ED_object_sculptmode_enter_ex(bmain, scene, ob, reports);
+ Depsgraph *depsgraph = CTX_data_depsgraph(C);
- ED_object_sculptmode_enter_ex(depsgraph, scene, ob, reports);
++ ED_object_sculptmode_enter_ex(bmain, depsgraph, scene, ob, reports);
}
void ED_object_sculptmode_exit_ex(
@@@ -5814,8 -5791,7 +5815,9 @@@ void ED_object_sculptmode_exit(bContex
static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op)
{
+ struct wmMsgBus *mbus = CTX_wm_message_bus(C);
+ Main *bmain = CTX_data_main(C);
+ Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C);
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
const int mode_flag = OB_MODE_SCULPT;
@@@ -5828,10 -5804,10 +5830,10 @@@
}
if (is_mode_set) {
- ED_object_sculptmode_exit_ex(scene, ob);
+ ED_object_sculptmode_exit_ex(depsgraph, scene, ob);
}
else {
- ED_object_sculptmode_enter_ex(depsgraph, scene, ob,
op->reports);
- ED_object_sculptmode_enter_ex(bmain, scene, ob, op->reports);
++ ED_object_sculptmode_enter_ex(bmain, depsgraph, scene, ob,
op->reports);
}
WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
diff --cc source/blender/editors/space_view3d/view3d_edit.c
index e2ff809db36,86b121ee9a5..cdf2106d8bf
--- a/source/b
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
