[Bf-blender-cvs] [0c4957c7564] greasepencil-object: GPencil: Cleanup - Rename BKE_gpencil_eval_geometry
Antonio Vazquez
noreply at git.blender.org
Thu Feb 13 13:20:16 CET 2020
Commit: 0c4957c75646e17e735058f468447cda92d87847
Author: Antonio Vazquez
Date: Thu Feb 13 13:10:43 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0c4957c75646e17e735058f468447cda92d87847
GPencil: Cleanup - Rename BKE_gpencil_eval_geometry
New name: BKE_gpencil_frame_active_set
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 07f5a0c6fc4..ea06157f4b2 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -158,7 +158,6 @@ struct bGPDstroke *BKE_gpencil_stroke_add_existing_style(struct bGPDframe *gpf,
/* Stroke and Fill - Alpha Visibility Threshold */
#define GPENCIL_ALPHA_OPACITY_THRESH 0.001f
#define GPENCIL_STRENGTH_MIN 0.003f
-#define GP_VERTEX_MASK_ATTENUATE 0.3f
bool BKE_gpencil_layer_is_editable(const struct bGPDlayer *gpl);
@@ -242,8 +241,8 @@ void BKE_gpencil_dvert_ensure(struct bGPDstroke *gps);
void BKE_gpencil_vgroup_remove(struct Object *ob, struct bDeformGroup *defgroup);
void BKE_gpencil_stroke_weights_duplicate(struct bGPDstroke *gps_src, struct bGPDstroke *gps_dst);
-/* GPencil geometry evaluation */
-void BKE_gpencil_eval_geometry(struct Depsgraph *depsgraph, struct bGPdata *gpd);
+/* Set active frame by layer. */
+void BKE_gpencil_frame_active_set(struct Depsgraph *depsgraph, struct bGPdata *gpd);
/* stroke geometry utilities */
void BKE_gpencil_stroke_normal(const struct bGPDstroke *gps, float r_normal[3]);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 546754c182b..5d4ea7ac0d9 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -389,7 +389,7 @@ static int gpencil_time_modifier(
}
/* *************************************************** */
-void BKE_gpencil_eval_geometry(Depsgraph *depsgraph, bGPdata *gpd)
+void BKE_gpencil_frame_active_set(Depsgraph *depsgraph, bGPdata *gpd)
{
DEG_debug_print_eval(depsgraph, __func__, gpd->id.name, gpd);
int ctime = (int)DEG_get_ctime(depsgraph);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 8ec8ccb3d4d..1b9600c0429 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1301,7 +1301,7 @@ void DepsgraphNodeBuilder::build_object_data_geometry_datablock(ID *obdata, bool
obdata,
NodeType::GEOMETRY,
OperationCode::GEOMETRY_EVAL,
- function_bind(BKE_gpencil_eval_geometry, _1, (bGPdata *)obdata_cow));
+ function_bind(BKE_gpencil_frame_active_set, _1, (bGPdata *)obdata_cow));
op_node->set_as_entry();
break;
}
More information about the Bf-blender-cvs
mailing list