[Bf-blender-cvs] [3fb13ea5ffc] greasepencil-object: WIP: Fix some merge errors
Antonio Vazquez
noreply at git.blender.org
Sat Dec 2 11:39:39 CET 2017
Commit: 3fb13ea5ffc3000205560bb73f56191af3ead771
Author: Antonio Vazquez
Date: Sat Dec 2 11:39:28 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3fb13ea5ffc3000205560bb73f56191af3ead771
WIP: Fix some merge errors
Still some more errors pending
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/util/undo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 800d971006c..51060782651 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -835,7 +835,7 @@ Object *BKE_object_add_for_data(
DEG_id_tag_update_ex(bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
layer_collection = BKE_layer_collection_get_active_ensure(scene, view_layer);
- BKE_collection_object_add(scene, layer_collection->scene_collection, ob);
+ BKE_collection_object_add(&scene->id, layer_collection->scene_collection, ob);
base = BKE_view_layer_base_find(view_layer, ob);
BKE_view_layer_base_select(view_layer, base);
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index c0078db3eb0..8a22c8c4bae 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -607,7 +607,6 @@ void do_versions_after_linking_280(Main *main)
}
}
}
-}
/* Grease Pencil Object */
if (!MAIN_VERSION_ATLEAST(main, 280, 2)) {
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 3c47d89b1a7..062e285bd05 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -175,6 +175,7 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
const int back = RNA_int_get(op->ptr, "back");
WorkSpace *workspace = CTX_wm_workspace(C);
+ Scene *scene = CTX_data_scene(C);
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
int mode;
@@ -212,7 +213,7 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
}
/* set workspace mode */
- BKE_workspace_object_mode_set(workspace, mode);
+ BKE_workspace_object_mode_set(workspace, scene, mode);
/* setup other modes */
gpencil_setup_modes(C, gpd, mode);
/* set cache as dirty */
@@ -258,6 +259,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
const int back = RNA_int_get(op->ptr, "back");
WorkSpace *workspace = CTX_wm_workspace(C);
+ Scene *scene = CTX_data_scene(C);
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
int mode;
@@ -291,7 +293,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
}
/* set workspace mode */
- BKE_workspace_object_mode_set(workspace, mode);
+ BKE_workspace_object_mode_set(workspace, scene, mode);
/* setup other modes */
gpencil_setup_modes(C, gpd, mode);
/* set cache as dirty */
@@ -337,6 +339,7 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op)
const int back = RNA_int_get(op->ptr, "back");
WorkSpace *workspace = CTX_wm_workspace(C);
+ Scene *scene = CTX_data_scene(C);
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
int mode;
@@ -370,7 +373,7 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op)
}
/* set workspace mode */
- BKE_workspace_object_mode_set(workspace, mode);
+ BKE_workspace_object_mode_set(workspace, scene, mode);
/* setup other modes */
gpencil_setup_modes(C, gpd, mode);
/* set cache as dirty */
@@ -416,6 +419,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op)
const int back = RNA_int_get(op->ptr, "back");
WorkSpace *workspace = CTX_wm_workspace(C);
+ Scene *scene = CTX_data_scene(C);
bGPdata *gpd = ED_gpencil_data_get_active(C);
bool is_object = false;
int mode;
@@ -449,7 +453,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op)
}
/* set workspace mode */
- BKE_workspace_object_mode_set(workspace, mode);
+ BKE_workspace_object_mode_set(workspace, scene, mode);
/* setup other modes */
gpencil_setup_modes(C, gpd, mode);
/* set cache as dirty */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 664031214bb..4c0b8df2407 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2391,6 +2391,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
/* enable paint mode */
if (p->sa->spacetype == SPACE_VIEW3D) {
Object *ob = CTX_data_active_object(C);
+ Scene *scene = CTX_data_scene(C);
WorkSpace *workspace = CTX_wm_workspace(C);
if (ob && (ob->type == OB_GPENCIL) && ((p->gpd->flag & GP_DATA_STROKE_PAINTMODE) == 0)) {
/* Just set paintmode flag... */
@@ -2401,7 +2402,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
p->gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
ob->mode = OB_MODE_GPENCIL_PAINT;
/* set workspace mode */
- BKE_workspace_object_mode_set(workspace, ob->mode);
+ BKE_workspace_object_mode_set(workspace, scene, ob->mode);
/* redraw mode on screen */
WM_event_add_notifier(C, NC_SCENE | ND_MODE, NULL);
}
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index c3dc4bbb49b..13291fb76b7 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -218,7 +218,7 @@ static eOLDrawState tree_element_set_active_object(
ED_gpencil_toggle_brush_cursor(C, false);
}
/* set workspace mode */
- BKE_workspace_object_mode_set(CTX_wm_workspace(C), ob->mode);
+ BKE_workspace_object_mode_set(CTX_wm_workspace(C), CTX_data_scene(C), ob->mode);
}
if (ob != scene->obedit)
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index cb5d005a0b7..10caac42f1c 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1631,7 +1631,7 @@ static bool ed_object_select_pick(
ED_gpencil_toggle_brush_cursor(C, false);
}
/* set workspace mode */
- BKE_workspace_object_mode_set(CTX_wm_workspace(C), basact->object->mode);
+ BKE_workspace_object_mode_set(CTX_wm_workspace(C), scene, basact->object->mode);
}
}
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index 86f9b33e6cb..4cdb5146be7 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -238,7 +238,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
ED_gpencil_toggle_brush_cursor(C, false);
}
/* set workspace mode */
- BKE_workspace_object_mode_set(CTX_wm_workspace(C), obact->mode);
+ BKE_workspace_object_mode_set(CTX_wm_workspace(C), scene, obact->mode);
}
}
More information about the Bf-blender-cvs
mailing list