[Bf-blender-cvs] [4e16e8b6711] master: Cleanup: warnings
Campbell Barton
noreply at git.blender.org
Thu Aug 26 04:47:33 CEST 2021
Commit: 4e16e8b6711538256823db936a00787e1e9e8679
Author: Campbell Barton
Date: Thu Aug 26 12:36:13 2021 +1000
Branches: master
https://developer.blender.org/rB4e16e8b6711538256823db936a00787e1e9e8679
Cleanup: warnings
===================================================================
M intern/cycles/blender/blender_object.cpp
M source/blender/draw/intern/draw_cache_extract.h
===================================================================
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index a7eae421b55..41871582f66 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -547,6 +547,7 @@ void BlenderSync::sync_procedural(BL::Object &b_ob,
#else
(void)b_ob;
(void)b_mesh_cache;
+ (void)has_subdivision_modifier;
#endif
}
diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h
index db96d6a774f..a680cc0d6b7 100644
--- a/source/blender/draw/intern/draw_cache_extract.h
+++ b/source/blender/draw/intern/draw_cache_extract.h
@@ -304,8 +304,8 @@ typedef struct MeshBatchCache {
MBC_EDITUV_EDGES | MBC_EDITUV_VERTS | MBC_EDITUV_FACEDOTS | MBC_WIRE_LOOPS_UVS)
void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
- MeshBatchCache *mbc,
- MeshBufferCache *extraction_cache,
+ MeshBatchCache *cache,
+ MeshBufferCache *mbc,
Mesh *me,
const bool is_editmode,
const bool is_paint_mode,
More information about the Bf-blender-cvs
mailing list