[Bf-blender-cvs] [f441dba93fa] temp-greasepencil-object-stacksplit: Merge branch 'greasepencil-object' into temp-greasepencil-object-stacksplit
Antonio Vazquez
noreply at git.blender.org
Sun Jun 17 19:49:45 CEST 2018
Commit: f441dba93fa75ec2cfdebc285f073302097afe35
Author: Antonio Vazquez
Date: Sun Jun 17 19:49:12 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBf441dba93fa75ec2cfdebc285f073302097afe35
Merge branch 'greasepencil-object' into temp-greasepencil-object-stacksplit
Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
source/blender/makesdna/DNA_modifier_types.h
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_gpencil.h
index 6291d9b1694,bec53fa4567..3db49b5b968
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -167,12 -166,14 +167,12 @@@ void BKE_gpencil_eval_geometry(struct D
bool BKE_gpencil_has_geometry_modifiers(struct Object *ob);
void BKE_gpencil_stroke_modifiers(
- struct Depsgraph *depsgraph, struct Object *ob,
+ struct Depsgraph *depsgraph, struct Object *ob,
struct bGPDlayer *gpl, struct bGPDframe *gpf, struct bGPDstroke *gps, bool is_render);
void BKE_gpencil_geometry_modifiers(
- struct Depsgraph *depsgraph, struct Object *ob,
+ struct Depsgraph *depsgraph, struct Object *ob,
struct bGPDlayer *gpl, struct bGPDframe *gpf, bool is_render);
-void BKE_gpencil_instance_modifier_instance_tfm(struct InstanceGpencilModifierData *mmd, const int elem_idx[3], float r_mat[4][4]);
-
void BKE_gpencil_lattice_init(struct Object *ob);
void BKE_gpencil_lattice_clear(struct Object *ob);
diff --cc source/blender/blenkernel/intern/gpencil_modifier.c
index 0fd61a47466,e4691d120d6..d9e6ddcd1f5
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@@ -379,10 -371,10 +379,10 @@@ bool BKE_gpencil_has_geometry_modifiers
/* apply stroke modifiers */
void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *UNUSED(gpf), bGPDstroke *gps, bool is_render)
{
- ModifierData *md;
+ GreasePencilModifierData *md;
bGPdata *gpd = ob->data;
const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
-
+
for (md = ob->modifiers.first; md; md = md->next) {
if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
{
diff --cc source/blender/blenloader/intern/readfile.c
index 70c0a025eb1,199d8c688c8..b6d5bedd4b0
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -5470,10 -5452,9 +5470,10 @@@ static void direct_link_object(FileDat
ob->mat= newdataadr(fd, ob->mat);
test_pointer_array(fd, (void **)&ob->mat);
ob->matbits= newdataadr(fd, ob->matbits);
-
+
/* do it here, below old data gets converted */
direct_link_modifiers(fd, &ob->modifiers);
+ direct_link_gpencil_modifiers(fd, &ob->greasepencil_modifiers);
link_list(fd, &ob->effect);
paf= ob->effect.first;
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index 4c13ab91bb7,3672941458d..a2a7d16878d
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@@ -403,15 -401,15 +403,15 @@@ static void build_concurrent(BuildGreas
/* Entry-point for Build Modifier */
static void gp_generateStrokes(
- ModifierData *md, Depsgraph *depsgraph,
+ GreasePencilModifierData *md, Depsgraph *depsgraph,
Object *UNUSED(ob), bGPDlayer *gpl, bGPDframe *gpf)
{
- BuildGpencilModifierData *mmd = (BuildGpencilModifierData *)md;
+ BuildGreasePencilModifierData *mmd = (BuildGreasePencilModifierData *)md;
const bool reverse = (mmd->transition != GP_BUILD_TRANSITION_GROW);
-
+
const float ctime = DEG_get_ctime(depsgraph);
//printf("GP Build Modifier - %f\n", ctime);
-
+
/* Early exit if it's an empty frame */
if (gpf->strokes.first == NULL) {
return;
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
index b6e51ed1f14,d7444c0c867..85c6e71b5c1
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
@@@ -199,10 -240,10 +199,10 @@@ static void generate_geometry
/* gp_bakeModifier - "Bake to Data" Mode */
static void bakeModifierGP_strokes(
Depsgraph *depsgraph,
- ModifierData *md, Object *ob)
+ GreasePencilModifierData *md, Object *ob)
{
bGPdata *gpd = ob->data;
-
+
for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
generate_geometry(md, depsgraph, ob, gpl, gpf);
@@@ -276,17 -317,17 +276,17 @@@ static void bakeModifierGP_objects(Mai
* much extra memory usage.
*/
newob = array_instance_add_ob_copy(bmain, scene, ob);
-
+
/* remove array on destination object */
- fmd = (ModifierData *)BLI_findstring(&newob->modifiers, md->name, offsetof(ModifierData, name));
+ fmd = (GreasePencilModifierData *)BLI_findstring(&newob->modifiers, md->name, offsetof(GreasePencilModifierData, name));
if (fmd) {
BLI_remlink(&newob->modifiers, fmd);
- modifier_free(fmd);
+ BKE_gpencil_modifier_free(fmd);
}
-
+
/* copy transforms to destination object */
copy_m4_m4(newob->obmat, finalmat);
-
+
copy_v3_v3(newob->loc, finalmat[3]);
mat4_to_eul(newob->rot, finalmat);
mat4_to_size(newob->size, finalmat);
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index b6057791de7,35bfcb499fb..108d7b5f3b2
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@@ -68,12 -66,12 +68,12 @@@ static void copyData(const GreasePencil
/* change stroke offsetness */
static void gp_deformStroke(
- ModifierData *md, Depsgraph *UNUSED(depsgraph),
+ GreasePencilModifierData *md, Depsgraph *UNUSED(depsgraph),
Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
{
- OffsetGpencilModifierData *mmd = (OffsetGpencilModifierData *)md;
+ OffsetGreasePencilModifierData *mmd = (OffsetGreasePencilModifierData *)md;
int vindex = defgroup_name_index(ob, mmd->vgname);
-
+
float mat[4][4];
float loc[3], rot[3], scale[3];
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 55f7a887456,80abea42b75..53f96e9a871
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@@ -134,10 -134,10 +134,10 @@@ static void gp_deformStroke
static void gp_bakeModifier(
struct Main *UNUSED(bmain), Depsgraph *depsgraph,
- ModifierData *md, Object *ob)
+ GreasePencilModifierData *md, Object *ob)
{
bGPdata *gpd = ob->data;
-
+
for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
index 83c0455c3ea,1dad4461d89..324001e8c94
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
@@@ -36,10 -36,9 +36,10 @@@
#include "DNA_vec_types.h"
#include "BLI_utildefines.h"
-
+
#include "BKE_context.h"
#include "BKE_gpencil.h"
+#include "BKE_gpencil_modifier.h"
#include "DEG_depsgraph.h"
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
index e87a4238ef9,abc9ca5056c..8a402e06a99
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
@@@ -40,10 -39,9 +40,10 @@@
#include "BLI_math.h"
#include "BLI_utildefines.h"
-
+
#include "BKE_context.h"
#include "BKE_gpencil.h"
+#include "BKE_gpencil_modifier.h"
#include "DEG_depsgraph.h"
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index a3c52275553,262132c6248..8d6f560ab44
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@@ -88,13 -86,13 +88,13 @@@ static void copyData(const GreasePencil
/* change stroke thickness */
static void gp_deformStroke(
- ModifierData *md, Depsgraph *UNUSED(depsgraph),
+ GreasePencilModifierData *md, Depsgraph *UNUSED(depsgraph),
Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
{
- ThickGpencilModifierData *mmd = (ThickGpencilModifierData *)md;
+ ThickGreasePencilModifierData *mmd = (ThickGreasePencilModifierData *)md;
int vindex = defgroup_name_index(ob, mmd->vgname);
- if (!is_stroke_affected_by_modifier(ob,
+ if (!is_stroke_affected_by_modifier(ob,
mmd->layername, mmd->pass_index, 3, gpl, gps,
mmd->flag & GP_THICK_INVERT_LAYER, mmd->flag & GP_THICK_INVERT_PASS))
{
More information about the Bf-blender-cvs
mailing list