archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPencil: Remove dummy marker for Grease Pencil objects

Browse Source 
After adding selecction using strokes, the dummy is not required because it was added as a provisional solution while we implement stroke selection.
This commit is contained in:
Antonio Vazquez
2019-02-27 20:46:04 +01:00
parent 461b1bdfbf
commit 9ddc2064a4
6 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_gpencil.py
View File

@@ -375,8 +375,6 @@ class DATA_PT_gpencil_display(ObjectButtonsPanel, Panel):
gpd = context.gpencil_data gpd = context.gpencil_data
gpl = context.active_gpencil_layer gpl = context.active_gpencil_layer
layout.prop(ob, "empty_display_size", text="Marker Size")
layout.prop(gpd, "edit_line_color", text="Edit Line Color") layout.prop(gpd, "edit_line_color", text="Edit Line Color")
if gpl: if gpl:
layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions") layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions")

7
source/blender/blenkernel/intern/object.c
View File

@@ -1661,11 +1661,6 @@ void BKE_object_obdata_size_init(struct Object *ob, const float size)
ob->empty_drawsize *= size; ob->empty_drawsize *= size;
break; break;
} }
case OB_GPENCIL:
{
ob->empty_drawsize *= size;
break;
}
case OB_FONT: case OB_FONT:
{ {
Curve *cu = ob->data; 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]; float size[3];
copy_v3_v3(size, ob->scale); 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); mul_v3_fl(size, ob->empty_drawsize);
} }

18
source/blender/draw/modes/object_mode.c
View File

@@ -2321,14 +2321,6 @@ static void volumes_free_smoke_textures(void)
BLI_freelistN(&e_data.smoke_domains); 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) static void DRW_shgroup_speaker(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer *view_layer)
{ {
float *color; 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); DRW_shgroup_empty(sh_data, sgl, ob, view_layer, rv3d, draw_ctx->sh_cfg);
break; 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: case OB_SPEAKER:
if (hide_object_extra) { if (hide_object_extra) {
break; break;

2
source/blender/editors/gpencil/gpencil_utils.c
View File

@@ -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); 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 */ /* create default brushes and colors */
ED_gpencil_add_defaults(C, ob); ED_gpencil_add_defaults(C, ob);

3
source/blender/editors/object/object_add.c
View File

@@ -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); ob = ED_object_add_type(C, OB_GPENCIL, ob_name, loc, rot, true, local_view_bits);
gpd = ob->data; gpd = ob->data;
newob = true; newob = true;
BKE_object_obdata_size_init(ob, GP_OBGPENCIL_DEFAULT_SIZE * radius);
} }
else { else {
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);

1
source/blender/makesdna/DNA_gpencil_types.h
View File

@@ -34,7 +34,6 @@ struct CurveMapping;
struct GHash; struct GHash;
struct MDeformVert; struct MDeformVert;
#define GP_OBGPENCIL_DEFAULT_SIZE 0.2f
#define GP_DEFAULT_PIX_FACTOR 1.0f #define GP_DEFAULT_PIX_FACTOR 1.0f
#define GP_DEFAULT_GRID_LINES 4 #define GP_DEFAULT_GRID_LINES 4
#define GP_MAX_INPUT_SAMPLES 10 #define GP_MAX_INPUT_SAMPLES 10