Commit: 6728b4a9b0779881d3e436cdb59213f06bee2f6a
Author: Campbell Barton
Date: Sun Jul 1 19:12:52 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6728b4a9b0779881d3e436cdb59213f06bee2f6a
Cleanup: trailing space
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/editors/gpencil/annotate_draw.c
M source/blender/editors/gpencil/gpencil_add_monkey.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_old.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/object/object_gpencil_modifier.c
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesrna/intern/rna_gpencil_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h
b/source/blender/blenkernel/BKE_gpencil_modifier.h
index e4a49f38f54..cd6b6540012 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -50,7 +50,7 @@ struct bGPDstroke;
struct ModifierUpdateDepsgraphContext;
#define GPENCIL_MODIFIER_ACTIVE(_md, _is_render) (((_md->mode &
eGpencilModifierMode_Realtime) && (_is_render == false)) || \
-
((_md->mode & eGpencilModifierMode_Render) && (_is_render ==
true)))
+
((_md->mode & eGpencilModifierMode_Render) && (_is_render ==
true)))
#define GPENCIL_MODIFIER_EDIT(_md, _is_edit) (((_md->mode &
eGpencilModifierMode_Editmode) == 0) && (_is_edit))
typedef enum {
@@ -112,7 +112,7 @@ typedef struct GpencilModifierTypeInfo {
* level settings to the target modifier.
*/
void (*copyData)(const struct GpencilModifierData *md, struct
GpencilModifierData *target);
-
+
/* Callback for GP "stroke" modifiers that operate on the
* shape and parameters of the provided strokes (e.g. Thickness, Noise,
etc.)
*
@@ -154,7 +154,7 @@ typedef struct GpencilModifierTypeInfo {
/* Initialize new instance data for this modifier type, this function
* should set modifier variables to their default values.
- *
+ *
* This function is optional.
*/
void (*initData)(struct GpencilModifierData *md);
@@ -182,7 +182,7 @@ typedef struct GpencilModifierTypeInfo {
*/
void (*updateDepsgraph)(struct GpencilModifierData *md,
const struct ModifierUpdateDepsgraphContext
*ctx);
-
+
/* Should return true if the modifier needs to be recalculated on time
* changes.
*
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index 50b78c95fff..0fac8aa162f 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1627,4 +1627,3 @@ void BKE_gpencil_stats_update(bGPdata *gpd)
}
}
-
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c
b/source/blender/blenkernel/intern/gpencil_modifier.c
index 17ad2ba3809..2ba738902a0 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -368,7 +368,7 @@ bool BKE_gpencil_has_geometry_modifiers(Object *ob)
GpencilModifierData *md;
for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
const GpencilModifierTypeInfo *mti =
BKE_gpencil_modifierType_getInfo(md->type);
-
+
if (mti && mti->generateStrokes) {
return true;
}
@@ -387,7 +387,7 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph,
Object *ob, bGPDlayer *g
if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
{
const GpencilModifierTypeInfo *mti =
BKE_gpencil_modifierType_getInfo(md->type);
-
+
if (GPENCIL_MODIFIER_EDIT(md, is_edit)) {
continue;
}
@@ -410,7 +410,7 @@ void BKE_gpencil_geometry_modifiers(Depsgraph *depsgraph,
Object *ob, bGPDlayer
if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
{
const GpencilModifierTypeInfo *mti =
BKE_gpencil_modifierType_getInfo(md->type);
-
+
if (GPENCIL_MODIFIER_EDIT(md, is_edit)) {
continue;
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 8df19495f89..80d29cbc2b9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1315,4 +1315,3 @@ void gpencil_instance_modifiers(GPENCIL_StorageList *stl,
Object *ob)
}
}
}
-
diff --git a/source/blender/editors/gpencil/annotate_draw.c
b/source/blender/editors/gpencil/annotate_draw.c
index f17fa09186a..9e69ab9f842 100644
--- a/source/blender/editors/gpencil/annotate_draw.c
+++ b/source/blender/editors/gpencil/annotate_draw.c
@@ -905,7 +905,7 @@ static void gp_draw_data_all(Scene *scene, bGPdata *gpd,
int offsx, int offsy, i
{
bGPdata *gpd_source = NULL;
float alpha = 1.0f;
-
+
if (scene) {
ToolSettings *ts = scene->toolsettings;
diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c
b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 372eb6cd628..8a7128adde1 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -1565,4 +1565,3 @@ void ED_gpencil_create_monkey(bContext *C, float
mat[4][4])
/* ***************************************************************** */
-
diff --git a/source/blender/editors/gpencil/gpencil_data.c
b/source/blender/editors/gpencil/gpencil_data.c
index f2b55b82bb1..7fed848e9a7 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -2410,4 +2410,3 @@ void GPENCIL_OT_color_choose(wmOperatorType *ot)
/* properties */
RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Index of
Color", 0, INT_MAX);
}
-
diff --git a/source/blender/editors/gpencil/gpencil_old.c
b/source/blender/editors/gpencil/gpencil_old.c
index f74a2d94f47..588fc443682 100644
--- a/source/blender/editors/gpencil/gpencil_old.c
+++ b/source/blender/editors/gpencil/gpencil_old.c
@@ -217,4 +217,3 @@ void GPENCIL_OT_convert_old_files(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index e7315483200..8aa15bd451b 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1717,4 +1717,3 @@ void ED_gpencil_update_color_uv(Main *bmain, Material
*mat)
}
}
/* ******************************************************** */
-
diff --git a/source/blender/editors/interface/interface_templates.c
b/source/blender/editors/interface/interface_templates.c
index 3c200a2b073..e377d9e2c7c 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1606,7 +1606,7 @@ static uiLayout *gpencil_draw_modifier(uiLayout *layout,
Object *ob,
uiItemO(row, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT,
"Copy"), ICON_NONE,
"OBJECT_OT_gpencil_modifier_copy");
-
+
/* result is the layout block inside the box, that we return so
that modifier settings can be drawn */
result = uiLayoutColumn(box, false);
block = uiLayoutAbsoluteBlock(box);
@@ -1627,7 +1627,7 @@ uiLayout *uiTemplateGpencilModifier(uiLayout *layout,
bContext *UNUSED(C), Point
Object *ob;
GpencilModifierData *md, *vmd;
int i;
-
+
/* verify we have valid data */
if (!RNA_struct_is_a(ptr->type, &RNA_GpencilModifier)) {
RNA_warning("Expected modifier on object");
diff --git a/source/blender/editors/object/object_gpencil_modifier.c
b/source/blender/editors/object/object_gpencil_modifier.c
index da4ee5c3c98..e39f1b15ff7 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -235,7 +235,7 @@ int ED_object_gpencil_modifier_apply(
Main *bmain, ReportList *reports, Depsgraph *depsgraph,
Scene *scene, Object *ob, GpencilModifierData *md, int UNUSED(mode))
{
-
+
if (ob->type == OB_GPENCIL) {
if (ob->mode != OB_MODE_OBJECT) {
BKE_report(reports, RPT_ERROR, "Modifiers cannot be
applied in paint, sculpt or edit mode");
@@ -632,4 +632,3 @@ void OBJECT_OT_gpencil_modifier_copy(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
gpencil_edit_modifier_properties(ot);
}
-
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt
b/source/blender/gpencil_modifiers/CMakeLists.txt
index cd8f3927cc0..4f840a47933 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -19,7 +19,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-set(INC
+set(INC
.
intern
../blenkernel
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index 8a2376a6c15..a4fff0f09b3 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -139,4 +139,3 @@ float get_modifier_point_weight(MDeformVert *dvert, int
inverse, int vindex)
return weight;
}
-
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index cbd9d699260..918a742dfeb 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@ -55,7 +55,7 @@
static void initData(GpencilModifierData *md)
{
BuildGpencilModifierData *gpmd = (BuildGpencilModifierData *)md;
-
+
/* We deliberately set this range to the half the default
* frame-range to have an immediate effect ot suggest use-cases
*/
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
index 8af8ec53f3a..82087d34c91 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
@@ -245,7 +245,7 @@ static void bakeModifierGP_objects(Main *bmain, Depsgraph
*depsgraph, GpencilMod
for (int z = 0; z < mmd->count[2]; z++) {
Object *newob;
GpencilModifierData *fmd;
-
+
const int elem_idx[3] = {x, y, z};
float mat[4][4], finalmat[4][4];
int sh;
@@ -304,8 +304,8 @@ static void generateStrokes(
Object *ob, bGPDlayer *gpl, bGPDframe *gpf)
{
InstanceGpencilModifierData *mmd = (InstanceGpencilModifierData *)md;
-
- /* When the "make_objects" flag is set, this modifier is handled as
part of the
+
+ /* When the "make_objects" flag is set, this modifier is handled as
part of the
* draw engine instead. The main benefit is that the instances won't
suffer from
* z-ordering problems.
*
@@ -324,7 +324,7 @@ static void bakeModifier(
GpencilModifierData *md, Object *ob)
{
InstanceGpencilModifierData *mmd = (InstanceGpencilModifierData *)md;
-
+
/* Create new objects or add all to
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
