[Bf-blender-cvs] [ca0dd753d36] temp-gpencil-eval: Fixes after first code review
Antonio Vazquez
noreply at git.blender.org
Thu Jan 16 15:49:34 CET 2020
Commit: ca0dd753d3665dd5d2a6f65ac8e3bbdba94e388d
Author: Antonio Vazquez
Date: Thu Jan 16 15:49:19 2020 +0100
Branches: temp-gpencil-eval
https://developer.blender.org/rBca0dd753d3665dd5d2a6f65ac8e3bbdba94e388d
Fixes after first code review
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index fd3318b62c9..5efdc2ccace 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -327,8 +327,8 @@ extern void (*BKE_gpencil_batch_cache_free_cb)(struct bGPdata *gpd);
#ifdef __cplusplus
extern "C" {
#endif
-void BKE_gpencil_update_frame_reference_pointers(const struct bGPDframe *gpf_orig,
- const struct bGPDframe *gpf_eval);
+void BKE_gpencil_frame_original_pointers_update(const struct bGPDframe *gpf_orig,
+ const struct bGPDframe *gpf_eval);
void BKE_gpencil_update_orig_pointers(const struct Object *ob_orig, const struct Object *ob_eval);
void BKE_gpencil_prepare_filling_data(const struct Object *ob_orig, const struct Object *ob_eval);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 694d7bbdec5..2d40ef1ecb3 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -3864,8 +3864,8 @@ void BKE_gpencil_prepare_filling_data(const struct Object *ob_orig, const struct
gpencil_prepare_filling(ob_eval);
}
-void BKE_gpencil_update_frame_reference_pointers(const struct bGPDframe *gpf_orig,
- const struct bGPDframe *gpf_eval)
+void BKE_gpencil_frame_original_pointers_update(const struct bGPDframe *gpf_orig,
+ const struct bGPDframe *gpf_eval)
{
int stroke_idx = -1;
LISTBASE_FOREACH (bGPDstroke *, gps_orig, &gpf_orig->strokes) {
@@ -3894,7 +3894,7 @@ void BKE_gpencil_update_orig_pointers(const Object *ob_orig, const Object *ob_ev
bGPdata *gpd_orig = (bGPdata *)ob_orig->data;
/* Assign pointers to the original stroke and points to the evaluated data. This must
- * be done before apply any modifier because at this moment the structure is equals,
+ * be done before applying any modifier because at this moment the structure is equals,
* so we can assume the layer index is the same in both datablocks.
* This data will be used by operators. */
@@ -3917,7 +3917,7 @@ void BKE_gpencil_update_orig_pointers(const Object *ob_orig, const Object *ob_ev
/* Update frame reference pointers. */
gpf_eval->runtime.gpf_orig = (bGPDframe *)gpf_orig;
- BKE_gpencil_update_frame_reference_pointers(gpf_orig, gpf_eval);
+ BKE_gpencil_frame_original_pointers_update(gpf_orig, gpf_eval);
}
}
}
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 7f91b793be1..63f2efb919a 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -851,7 +851,7 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o
ob->runtime.gpd_eval = BKE_gpencil_copy_for_eval(ob->runtime.gpd_orig, true);
gpencil_assign_object_eval(ob);
- BKE_gpencil_update_orig_pointers((Object *)ob_orig, (Object *)ob);
+ BKE_gpencil_update_orig_pointers(ob_orig, (Object *)ob);
}
else {
/* Replace only active frame. */
@@ -918,7 +918,7 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o
BKE_gpencil_frame_copy_strokes(gpf_orig, gpf_eval);
gpf_eval->runtime.gpf_orig = (bGPDframe *)gpf_orig;
- BKE_gpencil_update_frame_reference_pointers(gpf_orig, gpf_eval);
+ BKE_gpencil_frame_original_pointers_update(gpf_orig, gpf_eval);
}
}
}
More information about the Bf-blender-cvs
mailing list