[Bf-blender-cvs] [ea43de48e8c] temp-T88822-gpu-thread-safe-index-builder: Renamd default to none.
Jeroen Bakker
noreply at git.blender.org
Mon Jun 7 12:19:18 CEST 2021
Commit: ea43de48e8c60a49144c037dcfc8fac294438313
Author: Jeroen Bakker
Date: Mon Jun 7 12:19:05 2021 +0200
Branches: temp-T88822-gpu-thread-safe-index-builder
https://developer.blender.org/rBea43de48e8c60a49144c037dcfc8fac294438313
Renamd default to none.
===================================================================
M source/blender/draw/intern/draw_cache_extract.h
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h
index 747c4f7dd86..0b6dffa9073 100644
--- a/source/blender/draw/intern/draw_cache_extract.h
+++ b/source/blender/draw/intern/draw_cache_extract.h
@@ -77,7 +77,7 @@ typedef enum eMRIterType {
ENUM_OPERATORS(eMRIterType, MR_ITER_LVERT)
typedef enum eMRDataType {
- MR_DATA_DEFAULT = 0,
+ MR_DATA_NONE = 0,
MR_DATA_POLY_NOR = 1 << 1,
MR_DATA_LOOP_NOR = 1 << 2,
MR_DATA_LOOPTRI = 1 << 3,
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
index 91726d9893c..39732259e65 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
@@ -155,7 +155,7 @@ constexpr MeshExtract create_extractor_points()
extractor.iter_lvert_mesh = extract_points_iter_lvert_mesh;
extractor.task_finish = extract_points_task_finish;
extractor.finish = extract_points_finish;
- extractor.data_type = MR_DATA_DEFAULT;
+ extractor.data_type = MR_DATA_NONE;
extractor.use_threading = true;
extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points);
return extractor;
More information about the Bf-blender-cvs
mailing list