archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix build errors and warnings after recent changes, when not using Unity build

Browse Source
This commit is contained in:
Brecht Van Lommel
2022-09-26 21:11:44 +02:00
parent c15a761524
commit ddf6f70049
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/compositor/intern/COM_ChunkOrder.h
View File

@@ -7,20 +7,22 @@
# include "MEM_guardedalloc.h" # include "MEM_guardedalloc.h"
#endif #endif
#include "BLI_sys_types.h"
#include "COM_ChunkOrderHotspot.h" #include "COM_ChunkOrderHotspot.h"
namespace blender::compositor { namespace blender::compositor {
/** Helper to determine the order how chunks are prioritized during execution. */ /** Helper to determine the order how chunks are prioritized during execution. */
struct ChunkOrder { struct ChunkOrder {
unsigned int index = 0; uint index = 0;
int x = 0; int x = 0;
int y = 0; int y = 0;
double distance = 0.0; double distance = 0.0;
friend bool operator<(const ChunkOrder &a, const ChunkOrder &b); 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 #ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot") MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot")

4
source/blender/editors/transform/transform.c
View File

@@ -1579,10 +1579,10 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
} }
/* Save snapping settings. */ /* 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); 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_property_enum_set(op->ptr, prop, t->tsnap.mode);
RNA_boolean_set(op->ptr, "use_snap_project", t->tsnap.project); RNA_boolean_set(op->ptr, "use_snap_project", t->tsnap.project);
RNA_enum_set(op->ptr, "snap_target", t->tsnap.source_select); RNA_enum_set(op->ptr, "snap_target", t->tsnap.source_select);

2
source/blender/freestyle/intern/system/RandGen.cpp
View File

@@ -7,6 +7,8 @@
#include "RandGen.h" #include "RandGen.h"
#include "BLI_sys_types.h"
namespace Freestyle { namespace Freestyle {
// //