Commit: 2db8d319bc0e87f69f06dd3d4496b80e68d93f8b Author: Antonio Vazquez Date: Mon Sep 7 15:28:27 2020 +0200 Branches: greasepencil-edit-curve https://developer.blender.org/rB2db8d319bc0e87f69f06dd3d4496b80e68d93f8b
GPencil: Fix compiler errors and warnings The error was related to the draw manager refactor. =================================================================== M source/blender/blenkernel/BKE_gpencil_curve.h M source/blender/draw/intern/draw_cache_impl_gpencil.c M source/blender/makesrna/intern/rna_gpencil.c =================================================================== diff --git a/source/blender/blenkernel/BKE_gpencil_curve.h b/source/blender/blenkernel/BKE_gpencil_curve.h index e8c4139384f..1821972469c 100644 --- a/source/blender/blenkernel/BKE_gpencil_curve.h +++ b/source/blender/blenkernel/BKE_gpencil_curve.h @@ -31,6 +31,7 @@ struct Main; struct Object; struct Scene; struct bGPdata; +struct bGPDlayer; struct bGPDstroke; struct bGPDcurve; diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c index 0c6c2120466..655130fa4c1 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil.c +++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c @@ -877,7 +877,7 @@ static void gpencil_edit_batches_ensure(Object *ob, GpencilBatchCache *cache, in if (vert_len > 0) { GPU_vertbuf_data_alloc(cache->edit_curve_vbo, vert_len); - iter.verts = (gpEditCurveVert *)cache->edit_curve_vbo->data; + iter.verts = (gpEditCurveVert *)GPU_vertbuf_get_data(cache->edit_curve_vbo); /* Fill buffers with data. */ BKE_gpencil_visible_stroke_iter( diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 480e01f8eb6..ca8631a61f5 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -2399,7 +2399,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "curve_edit_corner_angle"); RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f)); RNA_def_property_float_default(prop, DEG2RADF(90.0f)); - RNA_def_property_ui_text(prop, "Corner Angle", "Angle threshold to be treated as corners."); + RNA_def_property_ui_text(prop, "Corner Angle", "Angle threshold to be treated as corners"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); prop = RNA_def_property(srna, "use_multiedit", PROP_BOOLEAN, PROP_NONE); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs