griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Core: use UTF8 string formatting for BKE_image (missed last commit)

Browse Source
This commit is contained in:
Campbell Barton
2025-07-22 16:41:13 +10:00
parent 4d4f518d80
commit c7ac5240d8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/scene.cc
View File

@@ -46,7 +46,7 @@
#include "BLI_math_base.h"
#include "BLI_math_rotation.h"
#include "BLI_path_utils.hh"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
#include "BLI_string_utils.hh"
#include "BLI_threads.h"
#include "BLI_utildefines.h"
@@ -2739,7 +2739,7 @@ SceneRenderView *BKE_scene_add_render_view(Scene *sce, const char *name)
}
SceneRenderView *srv = MEM_callocN<SceneRenderView>(__func__);
STRNCPY(srv->name, name);
STRNCPY_UTF8(srv->name, name);
BLI_uniquename(&sce->r.views,
srv,
DATA_("RenderView"),

2
source/blender/compositor/intern/render_context.cc
View File

@@ -79,7 +79,7 @@ void FileOutput::add_view(const char *view_name)
RenderView *render_view = MEM_callocN<RenderView>("Render View For File Output.");
BLI_addtail(&render_result_->views, render_view);
STRNCPY(render_view->name, view_name);
STRNCPY_UTF8(render_view->name, view_name);
}
void FileOutput::add_view(const char *view_name, int channels, float *buffer)

4
source/blender/editors/render/render_opengl.cc
View File

@@ -17,7 +17,7 @@
#include "BLI_listbase.h"
#include "BLI_math_color_blend.h"
#include "BLI_mutex.hh"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
#include "BLI_task.h"
#include "BLI_task.hh"
#include "BLI_utildefines.h"
@@ -232,7 +232,7 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
if (rv == nullptr) {
rv = MEM_callocN<RenderView>("new opengl render view");
STRNCPY(rv->name, srv->name);
STRNCPY_UTF8(rv->name, srv->name);
BLI_addtail(&rr->views, rv);
}
}

8
source/blender/render/intern/render_result.cc
View File

@@ -17,7 +17,7 @@
#include "BLI_listbase.h"
#include "BLI_path_utils.hh"
#include "BLI_rect.h"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
#include "BLI_string_utils.hh"
#include "BLI_utildefines.h"
@@ -146,7 +146,7 @@ void render_result_views_shallowcopy(RenderResult *dst, RenderResult *src)
rv = MEM_callocN<RenderView>("new render view");
BLI_addtail(&dst->views, rv);
STRNCPY(rv->name, rview->name);
STRNCPY_UTF8(rv->name, rview->name);
rv->ibuf = rview->ibuf;
}
@@ -625,7 +625,7 @@ static void *ml_addview_cb(void *base, const char *str)
RenderResult *rr = static_cast<RenderResult *>(base);
RenderView *rv = MEM_callocN<RenderView>("new render view");
STRNCPY(rv->name, str);
STRNCPY_UTF8(rv->name, str);
/* For stereo drawing we need to ensure:
* STEREO_LEFT_NAME == STEREO_LEFT_ID and
@@ -756,7 +756,7 @@ void render_result_view_new(RenderResult *rr, const char *viewname)
{
RenderView *rv = MEM_callocN<RenderView>("new render view");
BLI_addtail(&rr->views, rv);
STRNCPY(rv->name, viewname);
STRNCPY_UTF8(rv->name, viewname);
}
void render_result_views_new(RenderResult *rr, const RenderData *rd)