[Bf-blender-cvs] [2d93fa62314] greasepencil-object: Try to fix the merge problems.
Antonio Vazquez
noreply at git.blender.org
Fri Apr 6 10:37:40 CEST 2018
Commit: 2d93fa6231453d2e28b66ec241de426168507dd3
Author: Antonio Vazquez
Date: Fri Apr 6 10:37:21 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2d93fa6231453d2e28b66ec241de426168507dd3
Try to fix the merge problems.
Warning: Now this source code does not compile
===================================================================
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/undo/ed_undo.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 0381cf5bfab..8fddfc119b8 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -1154,8 +1154,7 @@ static bool gpsculpt_brush_init(bContext *C, wmOperator *op)
ToolSettings *ts = CTX_data_tool_settings(C);
Object *ob = CTX_data_active_object(C);
- WorkSpace *workspace = CTX_wm_workspace(C);
- const bool is_weight_mode = (workspace->object_mode == OB_MODE_GPENCIL_WEIGHT);
+ const bool is_weight_mode = ob->mode == OB_MODE_GPENCIL_WEIGHT;
tGP_BrushEditData *gso;
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index e20ed2fb992..f01f33d74d9 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1622,9 +1622,7 @@ static int gpencil_vertex_group_poll(bContext *C)
if ((ob) && (ob->type == OB_GPENCIL)) {
if (!ID_IS_LINKED(ob) && !ID_IS_LINKED(ob->data) && ob->defbase.first) {
- WorkSpace *workspace = CTX_wm_workspace(C);
- if (workspace &&
- ELEM(workspace->object_mode,
+ if (ELEM(ob->mode,
OB_MODE_GPENCIL_EDIT,
OB_MODE_GPENCIL_SCULPT))
{
@@ -1642,9 +1640,7 @@ static int gpencil_vertex_group_weight_poll(bContext *C)
if ((ob) && (ob->type == OB_GPENCIL)) {
if (!ID_IS_LINKED(ob) && !ID_IS_LINKED(ob->data) && ob->defbase.first) {
- WorkSpace *workspace = CTX_wm_workspace(C);
- if (workspace &&
- (workspace->object_mode == OB_MODE_GPENCIL_WEIGHT))
+ if (ob->mode == OB_MODE_GPENCIL_WEIGHT)
{
return true;
}
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 9deeeccfce4..bc9320a7c3c 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -136,11 +136,11 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
if (is_object) {
/* try to back previous mode */
- if ((workspace->object_mode_restore) && ((gpd->flag & GP_DATA_STROKE_EDITMODE) == 0) && (back == 1)) {
- mode = workspace->object_mode_restore;
+ if ((ob->restore_mode) && ((gpd->flag & GP_DATA_STROKE_EDITMODE) == 0) && (back == 1)) {
+ mode = ob->restore_mode;
}
- workspace->object_mode_restore = workspace->object_mode;
- workspace->object_mode = mode;
+ ob->restore_mode = ob->mode;
+ ob->mode = mode;
}
/* setup other modes */
@@ -216,11 +216,11 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
if (is_object) {
/* try to back previous mode */
- if ((workspace->object_mode_restore) && ((gpd->flag & GP_DATA_STROKE_PAINTMODE) == 0) && (back == 1)) {
- mode = workspace->object_mode_restore;
+ if ((ob->restore_mode) && ((gpd->flag & GP_DATA_STROKE_PAINTMODE) == 0) && (back == 1)) {
+ mode = ob->restore_mode;
}
- workspace->object_mode_restore = workspace->object_mode;
- workspace->object_mode = mode;
+ ob->restore_mode = ob->mode;
+ ob->mode = mode;
}
/* be sure we have brushes */
@@ -300,11 +300,11 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op)
if (is_object) {
/* try to back previous mode */
- if ((workspace->object_mode_restore) && ((gpd->flag & GP_DATA_STROKE_SCULPTMODE) == 0) && (back == 1)) {
- mode = workspace->object_mode_restore;
+ if ((ob->restore_mode) && ((gpd->flag & GP_DATA_STROKE_SCULPTMODE) == 0) && (back == 1)) {
+ mode = ob->restore_mode;
}
- workspace->object_mode_restore = workspace->object_mode;
- workspace->object_mode = mode;
+ ob->restore_mode = ob->mode;
+ ob->mode = mode;
}
/* setup other modes */
@@ -377,11 +377,11 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op)
if (is_object) {
/* try to back previous mode */
- if ((workspace->object_mode_restore) && ((gpd->flag & GP_DATA_STROKE_WEIGHTMODE) == 0) && (back == 1)) {
- mode = workspace->object_mode_restore;
+ if ((ob->restore_mode) && ((gpd->flag & GP_DATA_STROKE_WEIGHTMODE) == 0) && (back == 1)) {
+ mode = ob->restore_mode;
}
- workspace->object_mode_restore = workspace->object_mode;
- workspace->object_mode = mode;
+ ob->restore_mode = ob->mode;
+ ob->mode = mode;
}
/* setup other modes */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 891719470cc..7074966a62f 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2682,8 +2682,8 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
p->gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
p->gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
/* set workspace mode */
- workspace->object_mode_restore = workspace->object_mode;
- workspace->object_mode = OB_MODE_GPENCIL_PAINT;
+ ob->restore_mode = ob->mode;
+ ob->mode = OB_MODE_GPENCIL_PAINT;
/* redraw mode on screen */
WM_event_add_notifier(C, NC_SCENE | ND_MODE, NULL);
}
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 5d381f1b2d6..f220228a7e4 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1338,7 +1338,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
}
/* reset the icon */
- if (workspace->object_mode & OB_MODE_GPENCIL_PAINT) {
+ if (ob->mode & OB_MODE_GPENCIL_PAINT) {
switch (br->gp_icon_id) {
case GPBRUSH_PENCIL:
br->id.icon_id = ICON_GPBRUSH_PENCIL;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index fb697755036..7703c5641dd 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1501,7 +1501,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
if (!ob || !ED_object_mode_compat_test(ob, mode))
return OPERATOR_PASS_THROUGH;
-
+#if 0
/* if type is OB_GPENCIL, select mode for grease pencil strokes */
if ((ob) && (ob->type == OB_GPENCIL)) {
if (ob->data) {
@@ -1572,9 +1572,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
}
}
}
-
- if (!ob || !ED_object_mode_compat_test(ob, mode))
- return OPERATOR_PASS_THROUGH;
+#endif
if (ob->mode != mode) {
/* we should be able to remove this call, each operator calls */
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 0036c4bd47a..2a63aeb8a62 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -698,7 +698,7 @@ int ED_object_modifier_apply(
return 0;
}
else if (ob->type == OB_GPENCIL) {
- if (workspace->object_mode != OB_MODE_OBJECT) {
+ if (ob->mode != OB_MODE_OBJECT) {
BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied in paint, sculpt or edit mode");
return 0;
}
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index b0023fec640..55506d532ec 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -44,6 +44,8 @@
#include "BKE_main.h"
#include "BKE_report.h"
+#include "DEG_depsgraph.h"
+
#include "ED_paint.h"
#include "ED_screen.h"
#include "ED_image.h"
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index 4e9b3b30203..799a428316c 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -147,7 +147,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
if (obact && (obact->type == OB_GPENCIL)) {
WorkSpace *workspace = CTX_wm_workspace(C);
/* set cursor */
- if (ELEM(workspace->object_mode, OB_MODE_GPENCIL_PAINT, OB_MODE_GPENCIL_SCULPT, OB_MODE_GPENCIL_WEIGHT)) {
+ if (ELEM(obact->mode, OB_MODE_GPENCIL_PAINT, OB_MODE_GPENCIL_SCULPT, OB_MODE_GPENCIL_WEIGHT)) {
ED_gpencil_toggle_brush_cursor(C, true, NULL);
}
else {
More information about the Bf-blender-cvs
mailing list