Commit: bac221654c00b80c808228bfb83d3ab493acff8f
Author: Jeroen Bakker
Date: Mon Aug 17 16:21:08 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rBbac221654c00b80c808228bfb83d3ab493acff8f
Cleanup: remove editor from static function names
===================================================================
M source/blender/draw/engines/image/image_batches.c
M source/blender/draw/engines/image/image_engine.c
M source/blender/draw/engines/image/image_private.h
M source/blender/draw/engines/image/shaders/engine_image_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/image/image_batches.c
b/source/blender/draw/engines/image/image_batches.c
index 9822f97ea30..62b244c03d5 100644
--- a/source/blender/draw/engines/image/image_batches.c
+++ b/source/blender/draw/engines/image/image_batches.c
@@ -27,7 +27,7 @@
#include "image_private.h"
-static GPUVertFormat *editors_batches_image_instance_format(void)
+static GPUVertFormat *image_batches_instance_format(void)
{
static GPUVertFormat format = {0};
if (format.attr_len == 0) {
@@ -38,7 +38,7 @@ static GPUVertFormat
*editors_batches_image_instance_format(void)
GPUBatch *IMAGE_batches_image_instance_create(rcti *rect)
{
- GPUVertFormat *format = editors_batches_image_instance_format();
+ GPUVertFormat *format = image_batches_instance_format();
GPUVertBuf *vbo = GPU_vertbuf_create_with_format(format);
int32_t num_instances_x = (rect->xmax - rect->xmin) + 1;
diff --git a/source/blender/draw/engines/image/image_engine.c
b/source/blender/draw/engines/image/image_engine.c
index 383ccc13524..1051e4278c1 100644
--- a/source/blender/draw/engines/image/image_engine.c
+++ b/source/blender/draw/engines/image/image_engine.c
@@ -52,7 +52,7 @@ static struct {
} e_data = {{0}};
-static void editors_image_batch_instances_update(Image *image)
+static void image_batch_instances_update(Image *image)
{
const DRWContextState *draw_ctx = DRW_context_state_get();
SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
@@ -93,7 +93,7 @@ static void editors_image_batch_instances_update(Image *image)
}
}
-static void editors_image_cache_image(IMAGE_Data *id, Image *ima, ImageUser
*iuser, ImBuf *ibuf)
+static void image_cache_image(IMAGE_Data *id, Image *ima, ImageUser *iuser,
ImBuf *ibuf)
{
IMAGE_PassList *psl = id->psl;
IMAGE_StorageList *stl = id->stl;
@@ -243,7 +243,7 @@ static void IMAGE_cache_init(void *vedata)
}
}
- editors_image_batch_instances_update(image);
+ image_batch_instances_update(image);
{
/* Write depth is needed for background rendering. Near depth is used for
transparency
@@ -260,7 +260,7 @@ static void IMAGE_cache_init(void *vedata)
{
ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &pd->lock, 0);
- editors_image_cache_image(id, image, &sima->iuser, ibuf);
+ image_cache_image(id, image, &sima->iuser, ibuf);
pd->ibuf = ibuf;
}
}
diff --git a/source/blender/draw/engines/image/image_private.h
b/source/blender/draw/engines/image/image_private.h
index 27ab66935b4..b6b36c9aafc 100644
--- a/source/blender/draw/engines/image/image_private.h
+++ b/source/blender/draw/engines/image/image_private.h
@@ -55,11 +55,11 @@ typedef struct IMAGE_Data {
IMAGE_StorageList *stl;
} IMAGE_Data;
-/* editors_shaders.c */
+/* image_shaders.c */
GPUShader *IMAGE_shaders_image_get(void);
GPUShader *IMAGE_shaders_image_unavailable_get(void);
void IMAGE_shader_library_ensure(void);
void IMAGE_shaders_free(void);
-/* editors_batches.c */
+/* image_batches.c */
struct GPUBatch *IMAGE_batches_image_instance_create(struct rcti *rect);
\ No newline at end of file
diff --git a/source/blender/draw/engines/image/shaders/engine_image_frag.glsl
b/source/blender/draw/engines/image/shaders/engine_image_frag.glsl
index 677537b0edc..029826f0027 100644
--- a/source/blender/draw/engines/image/shaders/engine_image_frag.glsl
+++ b/source/blender/draw/engines/image/shaders/engine_image_frag.glsl
@@ -1,6 +1,6 @@
#pragma BLENDER_REQUIRE(common_colormanagement_lib.glsl)
-/* Keep in sync with editors_image.c */
+/* Keep in sync with image_engine.c */
#define SIMA_DRAW_FLAG_SHOW_ALPHA (1 << 0)
#define SIMA_DRAW_FLAG_APPLY_ALPHA (1 << 1)
#define SIMA_DRAW_FLAG_SHUFFLING (1 << 2)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
