Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-29 12:48:42 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-29 13:01:08 +0300
commitdc4c9de91a902b36c0d52a6546e09f649cf42c1e (patch)
tree34259cdb5dd529beb5e12ccc37c00058e8091dff /source/blender/draw/modes
parent6b9999e3fc046dab1ae14816ab30d58d44fc72c9 (diff)
Draw manager: Cleanup, naming
Similar to previous commit in Eevee.
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r--source/blender/draw/modes/edit_curve_mode.c2
-rw-r--r--source/blender/draw/modes/edit_lattice_mode.c2
-rw-r--r--source/blender/draw/modes/edit_metaball_mode.c2
-rw-r--r--source/blender/draw/modes/edit_surface_mode.c2
-rw-r--r--source/blender/draw/modes/edit_text_mode.c2
-rw-r--r--source/blender/draw/modes/object_mode.c4
-rw-r--r--source/blender/draw/modes/paint_texture_mode.c2
-rw-r--r--source/blender/draw/modes/particle_mode.c2
-rw-r--r--source/blender/draw/modes/sculpt_mode.c2
9 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c
index 1d542fc8e7e..1ecf1a60a35 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -89,7 +89,7 @@ typedef struct EDIT_CURVE_StorageList {
} EDIT_CURVE_StorageList;
typedef struct EDIT_CURVE_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c
index 675ea925a39..ff4c557326e 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -85,7 +85,7 @@ typedef struct EDIT_LATTICE_StorageList {
} EDIT_LATTICE_StorageList;
typedef struct EDIT_LATTICE_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index fb61114686b..a83f5ae33bc 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -81,7 +81,7 @@ typedef struct EDIT_METABALL_StorageList {
} EDIT_METABALL_StorageList;
typedef struct EDIT_METABALL_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_surface_mode.c b/source/blender/draw/modes/edit_surface_mode.c
index e99973144aa..4e60c4abff5 100644
--- a/source/blender/draw/modes/edit_surface_mode.c
+++ b/source/blender/draw/modes/edit_surface_mode.c
@@ -76,7 +76,7 @@ typedef struct EDIT_SURFACE_StorageList {
} EDIT_SURFACE_StorageList;
typedef struct EDIT_SURFACE_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_text_mode.c b/source/blender/draw/modes/edit_text_mode.c
index 476a2ab9ac2..b375bad84b5 100644
--- a/source/blender/draw/modes/edit_text_mode.c
+++ b/source/blender/draw/modes/edit_text_mode.c
@@ -83,7 +83,7 @@ typedef struct EDIT_TEXT_StorageList {
} EDIT_TEXT_StorageList;
typedef struct EDIT_TEXT_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index a1bb12aec25..91b64818eff 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1110,7 +1110,7 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, ViewLayer *vie
int theme_id = DRW_object_wire_theme_get(ob, view_layer, &color);
static float zero = 0.0f;
- float **la_mats = (float **)DRW_object_engine_data_get(ob, &draw_engine_object_type, NULL);
+ float **la_mats = (float **)DRW_object_engine_data_ensure(ob, &draw_engine_object_type, NULL);
if (*la_mats == NULL) {
/* we need 2 matrices */
*la_mats = MEM_mallocN(sizeof(float) * 16 * 2, "Lamp Object Mode Matrices");
@@ -1456,7 +1456,7 @@ static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl
DRW_object_wire_theme_get(ob, view_layer, &color);
OBJECT_LightProbeEngineData *prb_data;
- OBJECT_LightProbeEngineData **prb_data_pt = (OBJECT_LightProbeEngineData **)DRW_object_engine_data_get(ob, &draw_engine_object_type, NULL);
+ OBJECT_LightProbeEngineData **prb_data_pt = (OBJECT_LightProbeEngineData **)DRW_object_engine_data_ensure(ob, &draw_engine_object_type, NULL);
if (*prb_data_pt == NULL) {
*prb_data_pt = MEM_mallocN(sizeof(OBJECT_LightProbeEngineData), "Probe Clip distances Matrices");
}
diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c
index f898770acef..b49da0cba2f 100644
--- a/source/blender/draw/modes/paint_texture_mode.c
+++ b/source/blender/draw/modes/paint_texture_mode.c
@@ -90,7 +90,7 @@ typedef struct PAINT_TEXTURE_StorageList {
} PAINT_TEXTURE_StorageList;
typedef struct PAINT_TEXTURE_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_mode.c
index be076815f4c..6a3e53a72c2 100644
--- a/source/blender/draw/modes/particle_mode.c
+++ b/source/blender/draw/modes/particle_mode.c
@@ -70,7 +70,7 @@ typedef struct PARTICLE_StorageList {
} PARTICLE_StorageList;
typedef struct PARTICLE_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c
index f38e6565065..d9f1f5ebe91 100644
--- a/source/blender/draw/modes/sculpt_mode.c
+++ b/source/blender/draw/modes/sculpt_mode.c
@@ -80,7 +80,7 @@ typedef struct SCULPT_StorageList {
} SCULPT_StorageList;
typedef struct SCULPT_Data {
- /* Struct returned by DRW_viewport_engine_data_get.
+ /* Struct returned by DRW_viewport_engine_data_ensure.
* If you don't use one of these, just make it a (void *) */
// void *fbl;
void *engine_type; /* Required */