[Bf-blender-cvs] [cb32dd96045] greasepencil-object: Fix parameter type after merge
Antonio Vazquez
noreply at git.blender.org
Mon Jul 2 13:03:28 CEST 2018
Commit: cb32dd9604590564175e8c8b70094af9613605cb
Author: Antonio Vazquez
Date: Mon Jul 2 13:03:20 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBcb32dd9604590564175e8c8b70094af9613605cb
Fix parameter type after merge
===================================================================
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_colorpick.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_old.c
M source/blender/editors/gpencil/gpencil_ops.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index fb33ed87aca..17d1143aba7 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -195,7 +195,7 @@ static void gp_session_validatebuffer(tGPsdata *p);
/* Context Wrangling... */
/* check if context is suitable for drawing */
-static int gpencil_draw_poll(bContext *C)
+static bool gpencil_draw_poll(bContext *C)
{
if (ED_operator_regionactive(C)) {
/* check if current context can support GPencil data */
diff --git a/source/blender/editors/gpencil/gpencil_colorpick.c b/source/blender/editors/gpencil/gpencil_colorpick.c
index 890ad33bcd6..e14e885dfae 100644
--- a/source/blender/editors/gpencil/gpencil_colorpick.c
+++ b/source/blender/editors/gpencil/gpencil_colorpick.c
@@ -270,7 +270,7 @@ static void gpencil_colorpick_draw_3d(const bContext *C, ARegion *UNUSED(ar), vo
}
/* check if context is suitable */
-static int gpencil_colorpick_poll(bContext *C)
+static bool gpencil_colorpick_poll(bContext *C)
{
if (ED_operator_regionactive(C)) {
ScrArea *sa = CTX_wm_area(C);
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 66a81af4be7..43a76019525 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1367,7 +1367,7 @@ void GPENCIL_OT_sculpt_select(wmOperatorType *ot)
/*********************** Vertex Groups ***********************************/
-static int gpencil_vertex_group_poll(bContext *C)
+static bool gpencil_vertex_group_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
@@ -1385,7 +1385,7 @@ static int gpencil_vertex_group_poll(bContext *C)
return false;
}
-static int gpencil_vertex_group_weight_poll(bContext *C)
+static bool gpencil_vertex_group_weight_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
@@ -1973,7 +1973,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op)
}
/* Color Handle operator */
-static int gpencil_active_color_poll(bContext *C)
+static bool gpencil_active_color_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
if (ob && ob->data && (ob->type == OB_GPENCIL)) {
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 348e78a3904..03a3904fff3 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -182,7 +182,7 @@ void GPENCIL_OT_editmode_toggle(wmOperatorType *ot)
/* Stroke Paint Mode Management */
-static int gpencil_paintmode_toggle_poll(bContext *C)
+static bool gpencil_paintmode_toggle_poll(bContext *C)
{
/* if using gpencil object, use this gpd */
Object *ob = CTX_data_active_object(C);
@@ -271,7 +271,7 @@ void GPENCIL_OT_paintmode_toggle(wmOperatorType *ot)
/* Stroke Sculpt Mode Management */
-static int gpencil_sculptmode_toggle_poll(bContext *C)
+static bool gpencil_sculptmode_toggle_poll(bContext *C)
{
/* if using gpencil object, use this gpd */
Object *ob = CTX_data_active_object(C);
@@ -351,7 +351,7 @@ void GPENCIL_OT_sculptmode_toggle(wmOperatorType *ot)
/* Stroke Weight Paint Mode Management */
-static int gpencil_weightmode_toggle_poll(bContext *C)
+static bool gpencil_weightmode_toggle_poll(bContext *C)
{
/* if using gpencil object, use this gpd */
Object *ob = CTX_data_active_object(C);
@@ -440,7 +440,7 @@ static bool gp_stroke_edit_poll(bContext *C)
}
/* poll callback to verify edit mode in 3D view only */
-static int gp_strokes_edit3d_poll(bContext *C)
+static bool gp_strokes_edit3d_poll(bContext *C)
{
/* 2 Requirements:
* - 1) Editable GP data
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index e1667104fee..d52ca6368f5 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -941,7 +941,7 @@ static void gpencil_fill_draw_3d(const bContext *C, ARegion *UNUSED(ar), void *a
}
/* check if context is suitable for filling */
-static int gpencil_fill_poll(bContext *C)
+static bool gpencil_fill_poll(bContext *C)
{
if (ED_operator_regionactive(C)) {
ScrArea *sa = CTX_wm_area(C);
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index d48bfd99feb..b58ca3fb339 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -227,7 +227,7 @@ void gp_stroke_convertcoords_tpoint(struct Scene *scene, struct ARegion *ar,
bool gp_add_poll(struct bContext *C);
bool gp_active_layer_poll(struct bContext *C);
bool gp_active_brush_poll(struct bContext *C);
-boll gp_brush_crt_presets_poll(bContext *C);
+bool gp_brush_crt_presets_poll(bContext *C);
/* Copy/Paste Buffer --------------------------------- */
/* gpencil_edit.c */
diff --git a/source/blender/editors/gpencil/gpencil_old.c b/source/blender/editors/gpencil/gpencil_old.c
index 588fc443682..b7af1c80d4c 100644
--- a/source/blender/editors/gpencil/gpencil_old.c
+++ b/source/blender/editors/gpencil/gpencil_old.c
@@ -94,7 +94,7 @@ static void free_palettes(ListBase *list)
}
/* ***************** Convert old 2.7 files to 2.8 ************************ */
-static int gpencil_convert_old_files_poll(bContext *C)
+static bool gpencil_convert_old_files_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index dec12ac0d93..64ed3a97064 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -117,7 +117,7 @@ static bool gp_stroke_editmode_poll(bContext *C)
}
/* Poll callback for stroke painting mode */
-static int gp_stroke_paintmode_poll(bContext *C)
+static bool gp_stroke_paintmode_poll(bContext *C)
{
/* TODO: limit this to mode, but review 2D editors */
bGPdata *gpd = CTX_data_gpencil_data(C);
@@ -125,7 +125,7 @@ static int gp_stroke_paintmode_poll(bContext *C)
}
/* Poll callback for stroke painting (draw brush) */
-static int gp_stroke_paintmode_draw_poll(bContext *C)
+static bool gp_stroke_paintmode_draw_poll(bContext *C)
{
/* TODO: limit this to mode, but review 2D editors */
bGPdata *gpd = CTX_data_gpencil_data(C);
@@ -136,7 +136,7 @@ static int gp_stroke_paintmode_draw_poll(bContext *C)
}
/* Poll callback for stroke painting (erase brush) */
-static int gp_stroke_paintmode_erase_poll(bContext *C)
+static bool gp_stroke_paintmode_erase_poll(bContext *C)
{
/* TODO: limit this to mode, but review 2D editors */
bGPdata *gpd = CTX_data_gpencil_data(C);
@@ -147,7 +147,7 @@ static int gp_stroke_paintmode_erase_poll(bContext *C)
}
/* Poll callback for stroke painting (fill) */
-static int gp_stroke_paintmode_fill_poll(bContext *C)
+static bool gp_stroke_paintmode_fill_poll(bContext *C)
{
/* TODO: limit this to mode, but review 2D editors */
bGPdata *gpd = CTX_data_gpencil_data(C);
@@ -158,7 +158,7 @@ static int gp_stroke_paintmode_fill_poll(bContext *C)
}
/* Poll callback for stroke sculpting mode */
-static int gp_stroke_sculptmode_poll(bContext *C)
+static bool gp_stroke_sculptmode_poll(bContext *C)
{
bGPdata *gpd = CTX_data_gpencil_data(C);
Object *ob = CTX_data_active_object(C);
@@ -179,7 +179,7 @@ static int gp_stroke_sculptmode_poll(bContext *C)
}
/* Poll callback for stroke weight paint mode */
-static int gp_stroke_weightmode_poll(bContext *C)
+static bool gp_stroke_weightmode_poll(bContext *C)
{
bGPdata *gpd = CTX_data_gpencil_data(C);
Object *ob = CTX_data_active_object(C);
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 1132a68821e..c4f8e8b2739 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -93,7 +93,7 @@
/* Core/Shared Utilities */
/* Poll callback for primitive operators */
-static int gpencil_primitive_add_poll(bContext *C)
+static bool gpencil_primitive_add_poll(bContext *C)
{
/* only 3D view */
ScrArea *sa = CTX_wm_area(C);
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index e39f1b15ff7..7eb8cf39125 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -382,7 +382,7 @@ static int gpencil_edit_modifier_poll_generic(bContext *C, StructRNA *rna_type,
return 1;
}
-static int gpencil_edit_modifier_poll(bContext *C)
+static bool gpencil_edit_modifier_poll(bContext *C)
{
return gpencil_edit_modifier_poll_generic(C, &RNA_GpencilModifier, 0);
}
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 00570b59625..6fe9adca215 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1488,7 +1488,7 @@ bool rna_Lamp_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
return ((Object *)value.id.data)->type == OB_LAMP;
}
-int rna_GPencil_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
+bool rna_GPencil_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
{
return ((Object *)value.id.data)->type == OB_GPENCIL;
}
More information about the Bf-blender-cvs
mailing list