Commit: cf78b6b9bda91bc39e722fab5318f59fbc928002
Author: Antonio Vazquez
Date: Wed Jun 20 10:28:15 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBcf78b6b9bda91bc39e722fab5318f59fbc928002
More changes for review
Rename some fields
===================================================================
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenloader/intern/writefile.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h
b/source/blender/blenkernel/BKE_gpencil_modifier.h
index 4c1f97d4fad..35464035a4b 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -97,10 +97,10 @@ typedef struct GpencilModifierTypeInfo {
/* The DNA struct name for the modifier data type, used to
* write the DNA data out.
*/
- char structName[32];
+ char struct_name[32];
/* The size of the modifier data type, used by allocation. */
- int structSize;
+ int struct_size;
GpencilModifierType type;
GpencilModifierTypeFlag flags;
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c
b/source/blender/blenkernel/intern/gpencil_modifier.c
index 6891ef99c7c..957a56f7260 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -465,7 +465,7 @@ void BKE_gpencil_modifier_init(void)
GpencilModifierData *BKE_gpencil_modifier_new(int type)
{
const GpencilModifierTypeInfo *mti =
BKE_gpencil_modifierType_getInfo(type);
- GpencilModifierData *md = MEM_callocN(mti->structSize, mti->structName);
+ GpencilModifierData *md = MEM_callocN(mti->struct_size,
mti->struct_name);
/* note, this name must be made unique later */
BLI_strncpy(md->name, DATA_(mti->name), sizeof(md->name));
@@ -548,8 +548,8 @@ void BKE_gpencil_modifier_copyData_generic(const
GpencilModifierData *md_src, Gp
const size_t data_size = sizeof(GpencilModifierData);
const char *md_src_data = ((const char *)md_src) + data_size;
char *md_dst_data = ((char *)md_dst) + data_size;
- BLI_assert(data_size <= (size_t)mti->structSize);
- memcpy(md_dst_data, md_src_data, (size_t)mti->structSize - data_size);
+ BLI_assert(data_size <= (size_t)mti->struct_size);
+ memcpy(md_dst_data, md_src_data, (size_t)mti->struct_size - data_size);
}
static void gpencil_modifier_copy_data_id_us_cb(void *UNUSED(userData), Object
*UNUSED(ob), ID **idpoin, int cb_flag)
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index 7e6e63c3153..1590688687f 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1778,7 +1778,7 @@ static void write_gpencil_modifiers(WriteData *wd,
ListBase *modbase)
return;
}
- writestruct_id(wd, DATA, mti->structName, 1, md);
+ writestruct_id(wd, DATA, mti->struct_name, 1, md);
if (md->type == eGpencilModifierType_Thick) {
ThickGpencilModifierData *gpmd =
(ThickGpencilModifierData *)md;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index d9194eed78b..0c94e3a4458 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -59,6 +59,7 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
/* temp struct to hold data */
struct GPHookData_cb {
@@ -270,7 +271,7 @@ static void gp_bakeModifier(
HookGpencilModifierData *mmd = (HookGpencilModifierData *)md;
Scene *scene = md->scene;
bGPdata *gpd = ob->data;
- int oldframe = CFRA;
+ int oldframe = (int)DEG_get_ctime(depsgraph);
if (mmd->object == NULL)
return;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index 4dad2f533e3..6a27a4a951e 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@ -56,6 +56,7 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
static void initData(GpencilModifierData *md)
{
@@ -117,7 +118,7 @@ static void gp_bakeModifier(
Scene *scene = md->scene;
struct LatticeDeformData *ldata = NULL;
bGPdata *gpd = ob->data;
- int oldframe = CFRA;
+ int oldframe = (int)DEG_get_ctime(depsgraph);
if (mmd->object == NULL)
return;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 63827e075b2..4723c1a9b78 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -49,6 +49,7 @@
#include "BKE_object.h"
#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
#include "MOD_gpencil_util.h"
#include "MOD_gpencil_modifiertypes.h"
@@ -83,7 +84,7 @@ static bool dependsOnTime(GpencilModifierData *md)
/* aply noise effect based on stroke direction */
static void gp_deformStroke(
- GpencilModifierData *md, Depsgraph *UNUSED(depsgraph),
+ GpencilModifierData *md, Depsgraph *depsgraph,
Object *ob, bGPDlayer *gpl, bGPDstroke *gps)
{
NoiseGpencilModifierData *mmd = (NoiseGpencilModifierData *)md;
@@ -106,7 +107,7 @@ static void gp_deformStroke(
}
scene = mmd->modifier.scene;
- sc_frame = (scene) ? CFRA : 0;
+ sc_frame = (int)DEG_get_ctime(depsgraph);
zero_v3(vec2);
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h
b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 49c589c7341..75e7782468d 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -71,7 +71,6 @@ typedef struct GpencilModifierData {
short pad;
char name[64]; /* MAX_NAME */
- /* XXX for timing info set by caller... solve later? (ton) */
struct Scene *scene;
char *error;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
