[Bf-blender-cvs] [65f68ee023e] master: Cleanup: compiler warnings
Campbell Barton
noreply at git.blender.org
Sat Jan 21 13:09:35 CET 2023
Commit: 65f68ee023ea344783050a2b36788ee18cccdf8a
Author: Campbell Barton
Date: Sat Jan 21 23:09:20 2023 +1100
Branches: master
https://developer.blender.org/rB65f68ee023ea344783050a2b36788ee18cccdf8a
Cleanup: compiler warnings
===================================================================
M source/blender/blenkernel/intern/subsurf_ccg.cc
M source/blender/editors/include/ED_curves.h
M source/blender/editors/sculpt_paint/sculpt_expand.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.cc b/source/blender/blenkernel/intern/subsurf_ccg.cc
index a7342bb93b0..a3c634bff89 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.cc
+++ b/source/blender/blenkernel/intern/subsurf_ccg.cc
@@ -1094,7 +1094,7 @@ static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, MPoly *mpoly)
for (index = 0; index < totface; index++) {
CCGFace *f = ccgdm->faceMap[index].face;
int x, y, S, numVerts = ccgSubSurf_getFaceNumVerts(f);
- int flag = (faceFlags) ? faceFlags[index].flag : ME_SMOOTH;
+ char flag = (faceFlags) ? faceFlags[index].flag : char(ME_SMOOTH);
for (S = 0; S < numVerts; S++) {
for (y = 0; y < gridSize - 1; y++) {
diff --git a/source/blender/editors/include/ED_curves.h b/source/blender/editors/include/ED_curves.h
index 9cb673ff9e4..9c76713e3f4 100644
--- a/source/blender/editors/include/ED_curves.h
+++ b/source/blender/editors/include/ED_curves.h
@@ -8,6 +8,7 @@
struct bContext;
struct Curves;
+struct UndoType;
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc
index 532466ab426..a125545c010 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc
@@ -1865,7 +1865,7 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
return OPERATOR_FINISHED;
}
case SCULPT_EXPAND_MODAL_FALLOFF_GEODESIC: {
- expand_cache->falloff_gradient = SCULPT_EXPAND_MODAL_FALLOFF_GEODESIC;
+ expand_cache->falloff_gradient = true;
sculpt_expand_check_topology_islands(ob);
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
@@ -1889,7 +1889,7 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
break;
}
case SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY_DIAGONALS: {
- expand_cache->falloff_gradient = SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY_DIAGONALS;
+ expand_cache->falloff_gradient = true;
sculpt_expand_check_topology_islands(ob);
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
More information about the Bf-blender-cvs
mailing list