diff options
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 12 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 4 | ||||
-rw-r--r-- | source/blender/editors/render/render_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/render/render_preview.c | 24 | ||||
-rw-r--r-- | source/blender/editors/render/render_shading.c | 4 | ||||
-rw-r--r-- | source/blender/editors/render/render_update.c | 2 |
6 files changed, 25 insertions, 23 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 32bc1cff4a0..7ca711cd2b8 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -363,7 +363,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) RE_SetReports(re, NULL); - // no redraw needed, we leave state as we entered it + /* No redraw needed, we leave state as we entered it. */ ED_update_for_newframe(mainp, CTX_data_depsgraph_pointer(C)); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene); @@ -386,7 +386,7 @@ static void make_renderinfo_string(const RenderStats *rs, const char *error, char *str) { - char info_time_str[32]; // used to be extern to header_info.c + char info_time_str[32]; /* used to be extern to header_info.c */ uintptr_t mem_in_use, peak_memory; float megs_used_memory, megs_peak_memory; char *spos = str; @@ -526,7 +526,7 @@ static void render_image_update_pass_and_layer(RenderJob *rj, RenderResult *rr, LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { if (area->spacetype == SPACE_IMAGE) { SpaceImage *sima = area->spacedata.first; - // area->spacedata might be empty when toggling fullscreen mode. + /* area->spacedata might be empty when toggling full-screen mode. */ if (sima != NULL && sima->image == rj->image) { if (first_area == NULL) { first_area = area; @@ -944,9 +944,9 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even * since sequence rendering can call that recursively... (peter) */ BKE_sequencer_cache_cleanup(scene); - // store spare - // get view3d layer, local layer, make this nice api call to render - // store spare + /* store spare + * get view3d layer, local layer, make this nice api call to render + * store spare */ /* ensure at least 1 area shows result */ area = render_view_open(C, event->x, event->y, op->reports); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 80fa8082592..ed20d2895fc 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -90,8 +90,8 @@ # include "PIL_time.h" #endif -// TODO(sergey): Find better approximation of the scheduled frames. -// For really highres renders it might fail still. +/* TODO(sergey): Find better approximation of the scheduled frames. + * For really highres renders it might fail still. */ #define MAX_SCHEDULED_FRAMES 8 typedef struct OGLRender { diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index 8156f48343f..706249a3f8b 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -29,7 +29,7 @@ #include "WM_api.h" -#include "render_intern.h" // own include +#include "render_intern.h" /* own include */ /***************************** render ***********************************/ diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 6369b7bad43..4afa45893f9 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -111,7 +111,7 @@ ImBuf *get_brush_icon(Brush *brush) if (brush->flag & BRUSH_CUSTOM_ICON) { if (brush->icon_filepath[0]) { - // first use the path directly to try and load the file + /* First use the path directly to try and load the file. */ BLI_strncpy(path, brush->icon_filepath, sizeof(brush->icon_filepath)); BLI_path_abs(path, ID_BLEND_PATH_FROM_GLOBAL(&brush->id)); @@ -119,7 +119,7 @@ ImBuf *get_brush_icon(Brush *brush) /* use default colorspaces for brushes */ brush->icon_imbuf = IMB_loadiffname(path, flags, NULL); - // otherwise lets try to find it in other directories + /* otherwise lets try to find it in other directories */ if (!(brush->icon_imbuf)) { folder = BKE_appdir_folder_id(BLENDER_DATAFILES, "brushicons"); @@ -881,7 +881,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs sce->display.render_aa = SCE_DISPLAY_AA_SAMPLES_8; } - /* callbacs are cleared on GetRender() */ + /* Callbacks are cleared on GetRender(). */ if (ELEM(sp->pr_method, PR_BUTS_RENDER, PR_NODE_RENDER)) { RE_display_update_cb(re, sp, shader_preview_update); } @@ -907,7 +907,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs /* handle results */ if (sp->pr_method == PR_ICON_RENDER) { - // char *rct= (char *)(sp->pr_rect + 32*16 + 16); + // char *rct = (char *)(sp->pr_rect + 32 * 16 + 16); if (sp->pr_rect) { RE_ResultGet32(re, sp->pr_rect); @@ -917,12 +917,14 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs /* unassign the pointers, reset vars */ preview_prepare_scene(sp->bmain, sp->scene, NULL, GS(id->name), sp); - /* XXX bad exception, end-exec is not being called in render, because it uses local main */ - // if (idtype == ID_TE) { - // Tex *tex= (Tex *)id; - // if (tex->use_nodes && tex->nodetree) - // ntreeEndExecTree(tex->nodetree); - // } + /* XXX bad exception, end-exec is not being called in render, because it uses local main. */ +#if 0 + if (idtype == ID_TE) { + Tex *tex = (Tex *)id; + if (tex->use_nodes && tex->nodetree) + ntreeEndExecTree(tex->nodetree); + } +#endif } /* runs inside thread for material and icons */ @@ -1083,7 +1085,7 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat int source = deferred_data[0]; char *path = &deferred_data[1]; - // printf("generating deferred %d×%d preview for %s\n", sp->sizex, sp->sizey, path); + // printf("generating deferred %d×%d preview for %s\n", sp->sizex, sp->sizey, path); thumb = IMB_thumb_manage(path, THB_LARGE, source); diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 6fed806c8af..60e5c2081fd 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -94,7 +94,7 @@ #include "engines/eevee/eevee_lightcache.h" -#include "render_intern.h" // own include +#include "render_intern.h" /* own include */ static bool object_materials_supported_poll_ex(bContext *C, const Object *ob); @@ -1092,7 +1092,7 @@ static int light_cache_bake_exec(bContext *C, wmOperator *op) EEVEE_lightbake_job(rj, &stop, &do_update, &progress); EEVEE_lightbake_job_data_free(rj); - // no redraw needed, we leave state as we entered it + /* No redraw needed, we leave state as we entered it. */ ED_update_for_newframe(bmain, CTX_data_depsgraph_pointer(C)); WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene); diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index 1ba32d3386d..ffb2d3991b7 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -64,7 +64,7 @@ #include "WM_api.h" -#include "render_intern.h" // own include +#include "render_intern.h" /* own include */ /***************************** Render Engines ********************************/ |