Commit: 370d6293dc2a43d50bf7d6c6ef04beb9c22aec64
Author: Antonioya
Date: Wed Feb 27 20:46:04 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB370d6293dc2a43d50bf7d6c6ef04beb9c22aec64
GPencil: Remove dummy marker for Grease Pencil objects
After adding selecction using strokes, the dummy is not required because it was
added as a provisional solution while we implement stroke selection.
===================================================================
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M source/blender/blenkernel/intern/object.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/object/object_add.c
M source/blender/makesdna/DNA_gpencil_types.h
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py
b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 7a723901e4b..b8b197ac3ac 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -375,8 +375,6 @@ class DATA_PT_gpencil_display(ObjectButtonsPanel, Panel):
gpd = context.gpencil_data
gpl = context.active_gpencil_layer
- layout.prop(ob, "empty_display_size", text="Marker Size")
-
layout.prop(gpd, "edit_line_color", text="Edit Line Color")
if gpl:
layout.prop(gpd, "show_stroke_direction", text="Show Stroke
Directions")
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 1b4aad16778..ddfed90fd97 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1661,11 +1661,6 @@ void BKE_object_obdata_size_init(struct Object *ob,
const float size)
ob->empty_drawsize *= size;
break;
}
- case OB_GPENCIL:
- {
- ob->empty_drawsize *= size;
- break;
- }
case OB_FONT:
{
Curve *cu = ob->data;
@@ -2560,7 +2555,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float
max_r[3], const bool us
float size[3];
copy_v3_v3(size, ob->scale);
- if ((ob->type == OB_EMPTY) || (ob->type == OB_GPENCIL)) {
+ if (ob->type == OB_EMPTY) {
mul_v3_fl(size, ob->empty_drawsize);
}
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index 84c711aff60..e04512b00ac 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2321,14 +2321,6 @@ static void volumes_free_smoke_textures(void)
BLI_freelistN(&e_data.smoke_domains);
}
-static void DRW_shgroup_gpencil(OBJECT_ShadingGroupList *sgl, Object *ob,
ViewLayer *view_layer)
-{
- float *color;
- DRW_object_wire_theme_get(ob, view_layer, &color);
-
- DRW_shgroup_call_dynamic_add(sgl->gpencil_axes, color,
&ob->empty_drawsize, ob->obmat);
-}
-
static void DRW_shgroup_speaker(OBJECT_ShadingGroupList *sgl, Object *ob,
ViewLayer *view_layer)
{
float *color;
@@ -3059,16 +3051,6 @@ static void OBJECT_cache_populate(void *vedata, Object
*ob)
}
DRW_shgroup_empty(sh_data, sgl, ob, view_layer, rv3d,
draw_ctx->sh_cfg);
break;
- case OB_GPENCIL:
- if (hide_object_extra) {
- break;
- }
- /* in all modes except object mode hide always */
- if (draw_ctx->object_mode != OB_MODE_OBJECT) {
- break;
- }
- DRW_shgroup_gpencil(sgl, ob, view_layer);
- break;
case OB_SPEAKER:
if (hide_object_extra) {
break;
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index 9b19fb03f8b..a727e2cc5de 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1271,8 +1271,6 @@ Object *ED_gpencil_add_object(bContext *C, Scene
*UNUSED(scene), const float loc
Object *ob = ED_object_add_type(C, OB_GPENCIL, NULL, loc, rot, false,
local_view_bits);
- /* define size */
- BKE_object_obdata_size_init(ob, GP_OBGPENCIL_DEFAULT_SIZE);
/* create default brushes and colors */
ED_gpencil_add_defaults(C, ob);
diff --git a/source/blender/editors/object/object_add.c
b/source/blender/editors/object/object_add.c
index b95aa6c787a..425035d41cc 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1018,12 +1018,9 @@ static int object_gpencil_add_exec(bContext *C,
wmOperator *op)
}
}
- float radius = RNA_float_get(op->ptr, "radius");
ob = ED_object_add_type(C, OB_GPENCIL, ob_name, loc, rot, true,
local_view_bits);
gpd = ob->data;
newob = true;
-
- BKE_object_obdata_size_init(ob, GP_OBGPENCIL_DEFAULT_SIZE *
radius);
}
else {
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
diff --git a/source/blender/makesdna/DNA_gpencil_types.h
b/source/blender/makesdna/DNA_gpencil_types.h
index 3c5b90acd60..3080975360e 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -34,7 +34,6 @@ struct CurveMapping;
struct GHash;
struct MDeformVert;
-#define GP_OBGPENCIL_DEFAULT_SIZE 0.2f
#define GP_DEFAULT_PIX_FACTOR 1.0f
#define GP_DEFAULT_GRID_LINES 4
#define GP_MAX_INPUT_SAMPLES 10
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
