[Bf-blender-cvs] [ddf6f70049e] master: Fix build errors and warnings after recent changes, when not using Unity build
Brecht Van Lommel
noreply at git.blender.org
Mon Sep 26 22:18:21 CEST 2022
Commit: ddf6f70049e5a9f537ce15a5412bb67b4229ef43
Author: Brecht Van Lommel
Date: Mon Sep 26 21:11:44 2022 +0200
Branches: master
https://developer.blender.org/rBddf6f70049e5a9f537ce15a5412bb67b4229ef43
Fix build errors and warnings after recent changes, when not using Unity build
===================================================================
M source/blender/compositor/intern/COM_ChunkOrder.h
M source/blender/editors/transform/transform.c
M source/blender/freestyle/intern/system/RandGen.cpp
===================================================================
diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h
index 927eab97ccd..ef65d90dd3a 100644
--- a/source/blender/compositor/intern/COM_ChunkOrder.h
+++ b/source/blender/compositor/intern/COM_ChunkOrder.h
@@ -7,20 +7,22 @@
# include "MEM_guardedalloc.h"
#endif
+#include "BLI_sys_types.h"
+
#include "COM_ChunkOrderHotspot.h"
namespace blender::compositor {
/** Helper to determine the order how chunks are prioritized during execution. */
struct ChunkOrder {
- unsigned int index = 0;
+ uint index = 0;
int x = 0;
int y = 0;
double distance = 0.0;
friend bool operator<(const ChunkOrder &a, const ChunkOrder &b);
- void update_distance(ChunkOrderHotspot *hotspots, unsigned int len_hotspots);
+ void update_distance(ChunkOrderHotspot *hotspots, uint len_hotspots);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot")
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 716005333c8..a0934ae27aa 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1579,10 +1579,10 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
}
/* Save snapping settings. */
- if (prop = RNA_struct_find_property(op->ptr, "snap")) {
+ if ((prop = RNA_struct_find_property(op->ptr, "snap"))) {
RNA_property_boolean_set(op->ptr, prop, (t->modifiers & MOD_SNAP) != 0);
- if (prop = RNA_struct_find_property(op->ptr, "snap_elements")) {
+ if ((prop = RNA_struct_find_property(op->ptr, "snap_elements"))) {
RNA_property_enum_set(op->ptr, prop, t->tsnap.mode);
RNA_boolean_set(op->ptr, "use_snap_project", t->tsnap.project);
RNA_enum_set(op->ptr, "snap_target", t->tsnap.source_select);
diff --git a/source/blender/freestyle/intern/system/RandGen.cpp b/source/blender/freestyle/intern/system/RandGen.cpp
index 21ae863723a..b2161480c74 100644
--- a/source/blender/freestyle/intern/system/RandGen.cpp
+++ b/source/blender/freestyle/intern/system/RandGen.cpp
@@ -7,6 +7,8 @@
#include "RandGen.h"
+#include "BLI_sys_types.h"
+
namespace Freestyle {
//
More information about the Bf-blender-cvs
mailing list