Commit: 8becbffb9a5fcc38264b1e16400bd9b183361c55
Author: Antonio Vazquez
Date: Tue Mar 16 16:01:07 2021 +0100
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB8becbffb9a5fcc38264b1e16400bd9b183361c55
GPencil: Remove Curve runtime data
WIP: This commit produces compiler errors
===================================================================
M source/blender/blenkernel/intern/gpencil.c
M source/blender/makesdna/DNA_gpencil_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index 07d12c1dc2d..045a27eb7b3 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2786,7 +2786,6 @@ void BKE_gpencil_frame_original_pointers_update(const
struct bGPDframe *gpf_orig
bGPDcurve *gpc_orig = gps_orig->editcurve;
bGPDcurve *gpc_eval = gps_eval->editcurve;
- gpc_eval->runtime.gpc_orig = gpc_orig;
for (int i = 0; i < gpc_orig->tot_curve_points; i++) {
if (i > gpc_eval->tot_curve_points - 1) {
break;
@@ -2813,7 +2812,7 @@ void BKE_gpencil_frame_original_pointers_update(const
struct bGPDframe *gpf_orig
pt_eval->runtime.idx_orig = i;
}
}
-
+
/* Increase pointer. */
gps_eval = gps_eval->next;
}
diff --git a/source/blender/makesdna/DNA_gpencil_types.h
b/source/blender/makesdna/DNA_gpencil_types.h
index 50dc2ed93eb..0756d4c08ac 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -210,7 +210,7 @@ typedef struct bGPDcurve_point {
/** Vertex Color RGBA (A=mix factor). */
float vert_color[4];
-
+
bGPDcpoint_Runtime runtime;
} bGPDcurve_point;
@@ -222,11 +222,6 @@ typedef enum eGPDcurve_point_Flag {
/* ***************************************** */
/* GP Curve */
-typedef struct bGPDcurve_Runtime {
- struct bGPDcurve *gpc_orig;
- void *_pad;
-} bGPDcurve_Runtime;
-
/* Curve for Bezier Editing. */
typedef struct bGPDcurve {
/** Array of curve points. */
@@ -239,8 +234,7 @@ typedef struct bGPDcurve {
/** Vertex weight data. */
struct MDeformVert *dvert;
void *_pad2;
-
- bGPDcurve_Runtime runtime;
+
} bGPDcurve;
/* bGPDcurve_Flag->flag */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
