Commit: 68e00c852f62bce2b6022b9ddd96f9d88b43cc8b
Author: Joshua Leung
Date: Mon Oct 30 16:42:59 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB68e00c852f62bce2b6022b9ddd96f9d88b43cc8b
Fix compiler warning about const vs non-const
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/modifiers/intern/MOD_gpencilarray.c
M source/blender/modifiers/intern/MOD_gpencilcolor.c
M source/blender/modifiers/intern/MOD_gpencildupli.c
M source/blender/modifiers/intern/MOD_gpencillattice.c
M source/blender/modifiers/intern/MOD_gpencilnoise.c
M source/blender/modifiers/intern/MOD_gpencilopacity.c
M source/blender/modifiers/intern/MOD_gpencilsimplify.c
M source/blender/modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/modifiers/intern/MOD_gpencilthick.c
M source/blender/modifiers/intern/MOD_gpenciltint.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h
b/source/blender/blenkernel/BKE_modifier.h
index b29af94c5a3..68e1619dbd5 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -265,7 +265,7 @@ typedef struct ModifierTypeInfo {
* As such, this callback needs to go through all layers/frames in the
* datablock, mutating the geometry and/or creating new
datablocks/objects
*/
- void (*bakeModifierGP)(struct bContext *C, const struct
EvaluationContext *eval_ctx,
+ void (*bakeModifierGP)(const struct bContext *C, const struct
EvaluationContext *eval_ctx,
struct ModifierData *md, struct Object *ob);
/********************* Optional functions *********************/
diff --git a/source/blender/modifiers/intern/MOD_gpencilarray.c
b/source/blender/modifiers/intern/MOD_gpencilarray.c
index 439c46f5082..a8f38795fcd 100644
--- a/source/blender/modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/modifiers/intern/MOD_gpencilarray.c
@@ -79,7 +79,7 @@ static void copyData(ModifierData *md, ModifierData *target)
}
/* helper to create a new object */
-static Object *object_add_type(bContext *C, int UNUSED(type), const char
*UNUSED(name), Object *from_ob)
+static Object *object_add_type(const bContext *C, int UNUSED(type), const
char *UNUSED(name), Object *from_ob)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
@@ -100,7 +100,7 @@ static Object *object_add_type(bContext *C, int
UNUSED(type), const char *UNUSED
return ob;
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
GpencilArrayModifierData *mmd = (GpencilArrayModifierData *)md;
diff --git a/source/blender/modifiers/intern/MOD_gpencilcolor.c
b/source/blender/modifiers/intern/MOD_gpencilcolor.c
index d2f95953069..53e87af019e 100644
--- a/source/blender/modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/modifiers/intern/MOD_gpencilcolor.c
@@ -60,7 +60,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
GpencilColorModifierData *mmd = (GpencilColorModifierData *)md;
diff --git a/source/blender/modifiers/intern/MOD_gpencildupli.c
b/source/blender/modifiers/intern/MOD_gpencildupli.c
index dc8244b57d0..38371134f33 100644
--- a/source/blender/modifiers/intern/MOD_gpencildupli.c
+++ b/source/blender/modifiers/intern/MOD_gpencildupli.c
@@ -64,7 +64,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
bGPdata *gpd;
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c
b/source/blender/modifiers/intern/MOD_gpencillattice.c
index c65a6a72df7..7f29b836e5d 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -66,7 +66,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext *eval_ctx,
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*eval_ctx,
ModifierData *md, Object *ob)
{
GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
diff --git a/source/blender/modifiers/intern/MOD_gpencilnoise.c
b/source/blender/modifiers/intern/MOD_gpencilnoise.c
index 038a3e09cde..396f8a8848e 100644
--- a/source/blender/modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/modifiers/intern/MOD_gpencilnoise.c
@@ -65,7 +65,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
bGPdata *gpd;
diff --git a/source/blender/modifiers/intern/MOD_gpencilopacity.c
b/source/blender/modifiers/intern/MOD_gpencilopacity.c
index 2970a6e04a4..9600df0c9cf 100644
--- a/source/blender/modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/modifiers/intern/MOD_gpencilopacity.c
@@ -59,7 +59,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
bGPdata *gpd;
diff --git a/source/blender/modifiers/intern/MOD_gpencilsimplify.c
b/source/blender/modifiers/intern/MOD_gpencilsimplify.c
index 621bf18f219..f9c59000bb8 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsimplify.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsimplify.c
@@ -56,7 +56,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
bGPdata *gpd;
diff --git a/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
b/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
index 240da76320d..46ff97c3c2c 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsubdiv.c
@@ -57,7 +57,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
bGPdata *gpd;
diff --git a/source/blender/modifiers/intern/MOD_gpencilthick.c
b/source/blender/modifiers/intern/MOD_gpencilthick.c
index 3e4610bc96f..66ca6d2bf32 100644
--- a/source/blender/modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/modifiers/intern/MOD_gpencilthick.c
@@ -80,7 +80,7 @@ static void copyData(ModifierData *md, ModifierData *target)
tgmd->cur_thickness = curvemapping_copy(gmd->cur_thickness);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
bGPdata *gpd;
diff --git a/source/blender/modifiers/intern/MOD_gpenciltint.c
b/source/blender/modifiers/intern/MOD_gpenciltint.c
index 6951989b0de..a18b79dfbaf 100644
--- a/source/blender/modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/modifiers/intern/MOD_gpenciltint.c
@@ -60,7 +60,7 @@ static void copyData(ModifierData *md, ModifierData *target)
modifier_copyData_generic(md, target);
}
-static void bakeModifierGP(bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
+static void bakeModifierGP(const bContext *C, const EvaluationContext
*UNUSED(eval_ctx),
ModifierData *md, Object *ob)
{
GpencilTintModifierData *mmd = (GpencilTintModifierData *)md;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
