diff options
Diffstat (limited to 'source/blender/render')
23 files changed, 164 insertions, 147 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 8cb49f68243..6d994b36f26 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -224,8 +224,11 @@ void RE_init_threadcount(Render *re); void RE_TileProcessor(struct Render *re); /* only RE_NewRender() needed, main Blender render calls */ -void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, struct SceneRenderLayer *srl, struct Object *camera_override, unsigned int lay_override, int frame, const short write_still); -void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, unsigned int lay_override, int sfra, int efra, int tfra); +void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, + struct SceneRenderLayer *srl, struct Object *camera_override, + unsigned int lay_override, int frame, const bool write_still); +void RE_BlenderAnim(struct Render *re, struct Main *bmain, struct Scene *scene, struct Object *camera_override, + unsigned int lay_override, int sfra, int efra, int tfra); #ifdef WITH_FREESTYLE void RE_RenderFreestyleStrokes(struct Render *re, struct Main *bmain, struct Scene *scene, int render); #endif @@ -236,12 +239,12 @@ void RE_SetReports(struct Render *re, struct ReportList *reports); /* main preview render call */ void RE_PreviewRender(struct Render *re, struct Main *bmain, struct Scene *scene); -int RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode); -int RE_WriteRenderResult(struct ReportList *reports, RenderResult *rr, const char *filename, int compress); -struct RenderResult *RE_MultilayerConvert(void *exrhandle, const char *colorspace, int predivide, int rectx, int recty); +bool RE_ReadRenderResult(struct Scene *scene, struct Scene *scenode); +bool RE_WriteRenderResult(struct ReportList *reports, RenderResult *rr, const char *filename, int compress); +struct RenderResult *RE_MultilayerConvert(void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty); extern const float default_envmap_layout[]; -int RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, const char imtype, float layout[12]); +bool RE_WriteEnvmapResult(struct ReportList *reports, struct Scene *scene, struct EnvMap *env, const char *relpath, const char imtype, float layout[12]); /* do a full sample buffer compo */ void RE_MergeFullSample(struct Render *re, struct Main *bmain, struct Scene *sce, struct bNodeTree *ntree); diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index 69706ecc933..1f11cdc6729 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -40,7 +40,7 @@ struct Object; void free_sample_tables(Render *re); void make_sample_tables(Render *re); -void RE_parts_init(Render *re, int do_crop); +void RE_parts_init(Render *re, bool do_crop); void RE_parts_free(Render *re); void RE_parts_clamp(Render *re); diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 61b39a59b0b..457f1377e9b 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -57,7 +57,7 @@ struct RenderResult *render_result_new(struct Render *re, struct RenderResult *render_result_new_full_sample(struct Render *re, struct ListBase *lb, struct rcti *partrct, int crop, int savebuffers); -struct RenderResult *render_result_new_from_exr(void *exrhandle, const char *colorspace, int predivide, int rectx, int recty); +struct RenderResult *render_result_new_from_exr(void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty); /* Merge */ diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h index 891505dd3a8..9b14560b5f5 100644 --- a/source/blender/render/intern/include/renderdatabase.h +++ b/source/blender/render/intern/include/renderdatabase.h @@ -92,7 +92,7 @@ void free_renderdata_tables(struct Render *re); void free_renderdata_vertnodes(struct VertTableNode *vertnodes); void free_renderdata_vlaknodes(struct VlakTableNode *vlaknodes); -void project_renderdata(struct Render *re, void (*projectfunc)(const float *, float mat[4][4], float *), int do_pano, float xoffs, int do_buckets); +void project_renderdata(struct Render *re, void (*projectfunc)(const float *, float mat[4][4], float *), bool do_pano, float xoffs, bool do_buckets); int clip_render_object(float boundbox[2][3], float bounds[4], float mat[4][4]); /* functions are not exported... so wrong names */ diff --git a/source/blender/render/intern/raytrace/rayobject_octree.cpp b/source/blender/render/intern/raytrace/rayobject_octree.cpp index 6182d066f68..24804b8c0ad 100644 --- a/source/blender/render/intern/raytrace/rayobject_octree.cpp +++ b/source/blender/render/intern/raytrace/rayobject_octree.cpp @@ -380,7 +380,7 @@ static void d2dda(Octree *oc, short b1, short b2, short c1, short c2, char *ocfa x = ocx1; y = ocy1; lambda = MIN2(lambda_x, lambda_y); - while (TRUE) { + while (true) { if (x < 0 || y < 0 || x >= oc->ocres || y >= oc->ocres) { /* pass*/ @@ -1004,7 +1004,7 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is) /* this loop has been constructed to make sure the first and last node of ray * are always included, even when dda_lambda==1.0f or larger */ - while (TRUE) { + while (true) { no = ocread(oc, xo, yo, zo); if (no) { diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 766db0d7479..e9d3e294b28 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -398,7 +398,7 @@ static void SetTSpace(const SMikkTSpaceContext *pContext, const float fvTangent[ } } -static void calc_vertexnormals(Render *UNUSED(re), ObjectRen *obr, int do_tangent, int do_nmap_tangent) +static void calc_vertexnormals(Render *UNUSED(re), ObjectRen *obr, bool do_tangent, bool do_nmap_tangent) { int a; @@ -456,7 +456,7 @@ static void calc_vertexnormals(Render *UNUSED(re), ObjectRen *obr, int do_tangen } /* normal mapping tangent with mikktspace */ - if (do_nmap_tangent != FALSE) { + if (do_nmap_tangent != false) { SRenderMeshToTangent mesh2tangent; SMikkTSpaceContext sContext; SMikkTSpaceInterface sInterface; @@ -1328,7 +1328,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem float pa_time, pa_birthtime, pa_dietime; float random, simplify[2], pa_co[3]; const float cfra= BKE_scene_frame_get(re->scene); - int i, a, k, max_k=0, totpart, do_simplify = FALSE, do_surfacecache = FALSE, use_duplimat = FALSE; + int i, a, k, max_k=0, totpart; + bool do_simplify = false, do_surfacecache = false, use_duplimat = false; int totchild=0, step_nbr; int seed, path_nbr=0, orco1=0, num; int totface; @@ -1460,7 +1461,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem if (psys->flag & PSYS_USE_IMAT) { /* psys->imat is the original emitter's inverse matrix, ob->obmat is the duplicated object's matrix */ mul_m4_m4m4(duplimat, ob->obmat, psys->imat); - use_duplimat = TRUE; + use_duplimat = true; } /* 2.6 setup strand rendering */ @@ -1510,10 +1511,10 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem svert= strandbuf->vert; if (re->r.mode & R_SPEED) - do_surfacecache = TRUE; + do_surfacecache = true; else if ((re->wrld.mode & (WO_AMB_OCC|WO_ENV_LIGHT|WO_INDIRECT_LIGHT)) && (re->wrld.ao_gather_method == WO_AOGATHER_APPROX)) if (ma->amb != 0.0f) - do_surfacecache = TRUE; + do_surfacecache = true; totface= psmd->dm->getNumTessFaces(psmd->dm); index_mf_to_mpoly = psmd->dm->getTessFaceDataArray(psmd->dm, CD_ORIGINDEX); @@ -2600,7 +2601,8 @@ static void init_render_surf(Render *re, ObjectRen *obr, int timeoffset) DispList *dl; Material **matar; float *orco=NULL, mat[4][4]; - int a, totmat, need_orco=0; + int a, totmat; + bool need_orco = false; DerivedMesh *dm= NULL; cu= ob->data; @@ -2674,7 +2676,8 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset) float *data, *fp, *orco=NULL; float n[3], mat[4][4], nmat[4][4]; int nr, startvert, a, b; - int need_orco=0, totmat; + bool need_orco = false; + int totmat; cu= ob->data; if (ob->type==OB_FONT && cu->str==NULL) return; @@ -3151,10 +3154,11 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) CustomDataMask mask; float xn, yn, zn, imat[3][3], mat[4][4]; //nor[3], float *orco = NULL; - int need_orco=0, need_stress=0, need_nmap_tangent=0, need_tangent=0, need_origindex=0; + bool need_orco = false, need_stress = false, need_nmap_tangent = false, need_tangent = false, need_origindex = false; int a, a1, ok, vertofs; - int end, do_autosmooth = FALSE, totvert = 0; - int use_original_normals = FALSE; + int end, totvert = 0; + bool do_autosmooth = false; + bool use_original_normals = false; int recalc_normals = 0; /* false by default */ int negative_scale; #ifdef WITH_FREESTYLE @@ -3209,7 +3213,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) need_origindex= 1; /* check autosmooth and displacement, we then have to skip only-verts optimize */ - do_autosmooth |= (me->flag & ME_AUTOSMOOTH); + do_autosmooth |= (me->flag & ME_AUTOSMOOTH) != 0; if (do_autosmooth) timeoffset= 0; if (test_for_displace(re, ob ) ) @@ -3246,7 +3250,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) /* attempt to autsmooth on original mesh, only without subsurf */ if (do_autosmooth && me->totvert==totvert && me->totface==dm->getNumTessFaces(dm)) - use_original_normals= TRUE; + use_original_normals= true; ma= give_render_material(re, ob, 1); @@ -3270,7 +3274,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) for (a=0; a<totvert; a++, mvert++) { ver= RE_findOrAddVert(obr, obr->totvert++); copy_v3_v3(ver->co, mvert->co); - if (do_autosmooth == FALSE) { /* autosmooth on original unrotated data to prevent differences between frames */ + if (do_autosmooth == false) { /* autosmooth on original unrotated data to prevent differences between frames */ normal_short_to_float_v3(ver->n, mvert->no); mul_m4_v3(mat, ver->co); mul_transposed_m3_v3(imat, ver->n); @@ -3356,7 +3360,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) if ( mface->mat_nr==a1 ) { float len; - int reverse_verts = (negative_scale != 0 && do_autosmooth == FALSE); + int reverse_verts = (negative_scale != 0 && do_autosmooth == false); int rev_tab[] = {reverse_verts==0 ? 0 : 2, 1, reverse_verts==0 ? 2 : 0, 3}; v1= reverse_verts==0 ? mface->v1 : mface->v3; v2= mface->v2; @@ -4782,7 +4786,7 @@ void RE_Database_Free(Render *re) free_strand_surface(re); re->totvlak=re->totvert=re->totstrand=re->totlamp=re->tothalo= 0; - re->i.convertdone = FALSE; + re->i.convertdone = false; re->bakebuf= NULL; @@ -5167,7 +5171,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l re->lampren.first= re->lampren.last= NULL; slurph_opt= 0; - re->i.partsdone = FALSE; /* signal now in use for previewrender */ + re->i.partsdone = false; /* signal now in use for previewrender */ /* in localview, lamps are using normal layers, objects only local bits */ if (re->lay & 0xFF000000) @@ -5284,7 +5288,7 @@ void RE_Database_Preprocess(Render *re) volume_precache(re); } - re->i.convertdone = TRUE; + re->i.convertdone = true; if (re->test_break(re->tbh)) RE_Database_Free(re); @@ -5739,7 +5743,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned /* free dbase and make the future one */ strandsurface= re->strandsurface; memset(&re->strandsurface, 0, sizeof(ListBase)); - re->i.convertdone = TRUE; + re->i.convertdone = true; RE_Database_Free(re); re->strandsurface= strandsurface; @@ -5755,7 +5759,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned /* free dbase and make the real one */ strandsurface= re->strandsurface; memset(&re->strandsurface, 0, sizeof(ListBase)); - re->i.convertdone = TRUE; + re->i.convertdone = true; RE_Database_Free(re); re->strandsurface= strandsurface; diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 311ec1efc6b..39b9a0f0b63 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -532,7 +532,8 @@ static void render_envmap(Render *re, EnvMap *env) void make_envmaps(Render *re) { Tex *tex; - int do_init = FALSE, depth = 0, trace; + bool do_init = false; + int depth = 0, trace; if (!(re->r.mode & R_ENVMAP)) return; @@ -586,7 +587,7 @@ void make_envmaps(Render *re) if (env->ok == 0 && depth == 0) env->recalc = 1; if (env->ok == 0) { - do_init = TRUE; + do_init = true; render_envmap(re, env); if (depth == env->depth) env->recalc = 0; diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 5255e574c41..f5901370c61 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -131,7 +131,7 @@ bool RE_engine_is_external(Render *re) RenderEngine *RE_engine_create(RenderEngineType *type) { - return RE_engine_create_ex(type, FALSE); + return RE_engine_create_ex(type, false); } RenderEngine *RE_engine_create_ex(RenderEngineType *type, bool use_for_viewport) @@ -524,7 +524,7 @@ int RE_engine_render(Render *re, int do_all) engine->resolution_x = re->winx; engine->resolution_y = re->winy; - RE_parts_init(re, FALSE); + RE_parts_init(re, false); engine->tile_x = re->partx; engine->tile_y = re->party; @@ -563,7 +563,7 @@ int RE_engine_render(Render *re, int do_all) RE_parts_free(re); if (BKE_reports_contain(re->reports, RPT_ERROR)) - G.is_break = TRUE; + G.is_break = true; return 1; } diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 716c4b8af65..31748549768 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -227,7 +227,7 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], TexResul if (ima) { if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) { if ((tex->imaflag & TEX_CALCALPHA) == 0) { - texres->talpha = TRUE; + texres->talpha = true; } } } @@ -1536,7 +1536,7 @@ int imagewraposa(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], const if (ima) { if ((tex->imaflag & TEX_USEALPHA) && (ima->flag & IMA_IGNORE_ALPHA) == 0) { if ((tex->imaflag & TEX_CALCALPHA) == 0) { - texres->talpha = TRUE; + texres->talpha = true; } } } @@ -1909,7 +1909,7 @@ void image_sample(Image *ima, float fx, float fy, float dx, float dy, float resu if ( (R.flag & R_SEC_FIELD) && (ibuf->flags & IB_fields) ) ibuf->rect+= (ibuf->x*ibuf->y); - texres.talpha = TRUE; /* boxsample expects to be initialized */ + texres.talpha = true; /* boxsample expects to be initialized */ boxsample(ibuf, fx, fy, fx + dx, fy + dy, &texres, 0, 1); copy_v4_v4(result, &texres.tr); diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index fa47593bbe4..2c431bf869c 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -545,7 +545,7 @@ void RE_parts_clamp(Render *re) re->party = max_ii(1, min_ii(re->r.tiley, re->recty)); } -void RE_parts_init(Render *re, int do_crop) +void RE_parts_init(Render *re, bool do_crop) { int nr, xd, yd, partx, party, xparts, yparts; int xminb, xmaxb, yminb, ymaxb; diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index be11df4e1a6..b0416c5d517 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -432,7 +432,7 @@ static void *do_multires_bake_thread(void *data_v) bkr->baked_faces++; if (bkr->do_update) - *bkr->do_update = TRUE; + *bkr->do_update = true; if (bkr->progress) *bkr->progress = ((float)bkr->baked_objects + (float)bkr->baked_faces / handle->queue->tot_face) / bkr->tot_obj; @@ -463,7 +463,7 @@ static void init_ccgdm_arrays(DerivedMesh *dm) (void) grid_offset; } -static void do_multires_bake(MultiresBakeRender *bkr, Image *ima, int require_tangent, MPassKnownData passKnownData, +static void do_multires_bake(MultiresBakeRender *bkr, Image *ima, bool require_tangent, MPassKnownData passKnownData, MInitBakeData initBakeData, MFreeBakeData freeBakeData, MultiresBakeResult *result) { DerivedMesh *dm = bkr->lores_dm; @@ -937,7 +937,7 @@ static void build_permutation_table(unsigned short permutation[], unsigned short for (i = 0; i < number_of_rays; i++) { const unsigned int nr_entries_left = number_of_rays - i; - unsigned short rnd = is_first_perm_table != FALSE ? get_ao_random1(i) : get_ao_random2(i); + unsigned short rnd = is_first_perm_table != false ? get_ao_random1(i) : get_ao_random2(i); const unsigned short entry = rnd % nr_entries_left; /* pull entry */ @@ -1072,7 +1072,7 @@ static void build_coordinate_frame(float axisX[3], float axisY[3], const float a } } -/* return FALSE if nothing was hit and TRUE otherwise */ +/* return false if nothing was hit and true otherwise */ static int trace_ao_ray(MAOBakeData *ao_data, float ray_start[3], float ray_direction[3]) { Isect isect = {{0}}; @@ -1234,14 +1234,14 @@ static void bake_images(MultiresBakeRender *bkr, MultiresBakeResult *result) switch (bkr->mode) { case RE_BAKE_NORMALS: - do_multires_bake(bkr, ima, TRUE, apply_tangmat_callback, init_normal_data, free_normal_data, result); + do_multires_bake(bkr, ima, true, apply_tangmat_callback, init_normal_data, free_normal_data, result); break; case RE_BAKE_DISPLACEMENT: case RE_BAKE_DERIVATIVE: - do_multires_bake(bkr, ima, FALSE, apply_heights_callback, init_heights_data, free_heights_data, result); + do_multires_bake(bkr, ima, false, apply_heights_callback, init_heights_data, free_heights_data, result); break; case RE_BAKE_AO: - do_multires_bake(bkr, ima, FALSE, apply_ao_callback, init_ao_data, free_ao_data, result); + do_multires_bake(bkr, ima, false, apply_ao_callback, init_ao_data, free_ao_data, result); break; } } diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index d144da5bc4e..1a3d07f9aeb 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -146,7 +146,7 @@ static void result_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr)) {} static void result_rcti_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect)) {} static void stats_nothing(void *UNUSED(arg), RenderStats *UNUSED(rs)) {} static void float_nothing(void *UNUSED(arg), float UNUSED(val)) {} -static int default_break(void *UNUSED(arg)) { return G.is_break == TRUE; } +static int default_break(void *UNUSED(arg)) { return G.is_break == true; } static void stats_background(void *UNUSED(arg), RenderStats *rs) { @@ -211,7 +211,7 @@ RenderLayer *RE_GetRenderLayer(RenderResult *rr, const char *name) } } -RenderResult *RE_MultilayerConvert(void *exrhandle, const char *colorspace, int predivide, int rectx, int recty) +RenderResult *RE_MultilayerConvert(void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty) { return render_result_new_from_exr(exrhandle, colorspace, predivide, rectx, recty); } @@ -506,7 +506,7 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer * { bool had_freestyle = (re->r.mode & R_EDGE_FRS) != 0; - re->ok = TRUE; /* maybe flag */ + re->ok = true; /* maybe flag */ re->i.starttime = PIL_check_seconds_timer(); @@ -1029,7 +1029,7 @@ static void threaded_tile_processor(Render *re) /* warning; no return here without closing exr file */ - RE_parts_init(re, TRUE); + RE_parts_init(re, true); if (re->result->do_exr_tile) render_result_exr_file_begin(re); @@ -1297,7 +1297,7 @@ static void addblur_rect(RenderResult *rr, float *rectf, float *rectf1, float bl /* called by blur loop, accumulate renderlayers */ -static void merge_renderresult_blur(RenderResult *rr, RenderResult *brr, float blurfac, int key_alpha) +static void merge_renderresult_blur(RenderResult *rr, RenderResult *brr, float blurfac, bool key_alpha) { RenderLayer *rl, *rl1; RenderPass *rpass, *rpass1; @@ -1341,7 +1341,7 @@ static void do_render_blur_3d(Render *re) blurfac = 1.0f / (float)(re->r.mblur_samples - blur); - merge_renderresult_blur(rres, re->result, blurfac, FALSE); + merge_renderresult_blur(rres, re->result, blurfac, false); if (re->test_break(re->tbh)) break; } @@ -1502,7 +1502,7 @@ static void do_render_fields_blur_3d(Render *re) /* also check for camera here */ if (camera == NULL) { BKE_report(re->reports, RPT_ERROR, "Cannot render, no camera"); - G.is_break = TRUE; + G.is_break = true; return; } @@ -1602,7 +1602,7 @@ static int composite_needs_render(Scene *sce, int this_scene) bNode *node; if (ntree == NULL) return 1; - if (sce->use_nodes == FALSE) return 1; + if (sce->use_nodes == false) return 1; if ((sce->r.scemode & R_DOCOMP) == 0) return 1; for (node = ntree->nodes.first; node; node = node->next) { @@ -1964,7 +1964,7 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree) ntreeCompositTagRender(re->scene); ntreeCompositTagAnimated(ntree); - ntreeCompositExecTree(re->scene, ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings); + ntreeCompositExecTree(re->scene, ntree, &re->r, true, G.background == 0, &re->scene->view_settings, &re->scene->display_settings); } /* ensure we get either composited result or the active layer */ @@ -2038,7 +2038,7 @@ void RE_MergeFullSample(Render *re, Main *bmain, Scene *sce, bNodeTree *ntree) bNode *node; /* default start situation */ - G.is_break = FALSE; + G.is_break = false; re->main = bmain; re->scene = sce; @@ -2160,7 +2160,7 @@ static void do_render_composite_fields_blur_3d(Render *re) if (re->r.scemode & R_FULL_SAMPLE) do_merge_fullsample(re, ntree); else { - ntreeCompositExecTree(re->scene, ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings); + ntreeCompositExecTree(re->scene, ntree, &re->r, true, G.background == 0, &re->scene->view_settings, &re->scene->display_settings); } ntree->stats_draw = NULL; @@ -2404,24 +2404,24 @@ static int check_valid_camera(Scene *scene, Object *camera_override, ReportList return true; } -static int node_tree_has_composite_output(bNodeTree *ntree) +static bool node_tree_has_composite_output(bNodeTree *ntree) { bNode *node; for (node = ntree->nodes.first; node; node = node->next) { if (ELEM(node->type, CMP_NODE_COMPOSITE, CMP_NODE_OUTPUT_FILE)) { - return TRUE; + return true; } else if (node->type == NODE_GROUP) { if (node->id) { if (node_tree_has_composite_output((bNodeTree *)node->id)) { - return TRUE; + return true; } } } } - return FALSE; + return false; } static int check_composite_output(Scene *scene) @@ -2630,10 +2630,11 @@ void RE_SetReports(Render *re, ReportList *reports) } /* general Blender frame render call */ -void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *srl, Object *camera_override, unsigned int lay_override, int frame, const short write_still) +void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *srl, Object *camera_override, + unsigned int lay_override, int frame, const bool write_still) { /* ugly global still... is to prevent preview events and signal subsurfs etc to make full resol */ - G.is_rendering = TRUE; + G.is_rendering = true; scene->r.cfra = frame; @@ -2651,7 +2652,8 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *sr } else { char name[FILE_MAX]; - BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, &scene->r.im_format, scene->r.scemode & R_EXTENSION, FALSE); + BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, + &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, false); /* reports only used for Movie */ do_write_image_or_movie(re, bmain, scene, NULL, name); @@ -2664,7 +2666,7 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *sr BLI_callback_exec(re->main, (ID *)scene, G.is_break ? BLI_CB_EVT_RENDER_CANCEL : BLI_CB_EVT_RENDER_COMPLETE); /* UGLY WARNING */ - G.is_rendering = FALSE; + G.is_rendering = false; } #ifdef WITH_FREESTYLE @@ -2699,7 +2701,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie ibuf->rect = MEM_mapallocN(sizeof(int) * rres.rectx * rres.recty, "temp 32 bits rect"); ibuf->mall |= IB_rect; RE_AcquiredResultGet32(re, &rres, ibuf->rect); - do_free = TRUE; + do_free = true; } @@ -2723,7 +2725,8 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie if (name_override) BLI_strncpy(name, name_override, sizeof(name)); else - BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, &scene->r.im_format, scene->r.scemode & R_EXTENSION, TRUE); + BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, + &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, true); if (re->r.im_format.imtype == R_IMF_IMTYPE_MULTILAYER) { if (re->result) { @@ -2786,7 +2789,8 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie } /* saves images to disk */ -void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_override, unsigned int lay_override, int sfra, int efra, int tfra) +void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_override, + unsigned int lay_override, int sfra, int efra, int tfra) { bMovieHandle *mh = BKE_movie_handle_get(scene->r.im_format.imtype); int cfrao = scene->r.cfra; @@ -2798,7 +2802,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri /* ugly global still... is to prevent renderwin events and signal subsurfs etc to make full resol */ /* is also set by caller renderwin.c */ - G.is_rendering = TRUE; + G.is_rendering = true; re->flag |= R_ANIMATION; @@ -2820,7 +2824,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri } if (!mh->start_movie(scene, &re->r, width, height, re->reports)) - G.is_break = TRUE; + G.is_break = true; } if (mh->get_next_frame) { @@ -2836,16 +2840,16 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri if (re->test_break(re->tbh) == 0) { if (!do_write_image_or_movie(re, bmain, scene, mh, NULL)) - G.is_break = TRUE; + G.is_break = true; } - if (G.is_break == FALSE) { + if (G.is_break == false) { BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* keep after file save */ } } else { if (re->test_break(re->tbh)) { - G.is_break = TRUE; + G.is_break = true; } } } @@ -2879,7 +2883,8 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri /* Touch/NoOverwrite options are only valid for image's */ if (BKE_imtype_is_movie(scene->r.im_format.imtype) == 0) { if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH)) - BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, &scene->r.im_format, scene->r.scemode & R_EXTENSION, TRUE); + BKE_makepicstring(name, scene->r.pic, bmain->name, scene->r.cfra, + &scene->r.im_format, (scene->r.scemode & R_EXTENSION) != 0, true); if (scene->r.mode & R_NO_OVERWRITE && BLI_exists(name)) { printf("skipping existing frame \"%s\"\n", name); @@ -2904,12 +2909,12 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri if (re->test_break(re->tbh) == 0) { if (!G.is_break) if (!do_write_image_or_movie(re, bmain, scene, mh, NULL)) - G.is_break = TRUE; + G.is_break = true; } else - G.is_break = TRUE; + G.is_break = true; - if (G.is_break == TRUE) { + if (G.is_break == true) { /* remove touched file */ if (BKE_imtype_is_movie(scene->r.im_format.imtype) == 0) { if (scene->r.mode & R_TOUCH && BLI_exists(name) && BLI_file_size(name) == 0) { @@ -2920,7 +2925,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri break; } - if (G.is_break == FALSE) { + if (G.is_break == false) { BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_POST); /* keep after file save */ } } @@ -2940,7 +2945,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri BLI_callback_exec(re->main, (ID *)scene, G.is_break ? BLI_CB_EVT_RENDER_CANCEL : BLI_CB_EVT_RENDER_COMPLETE); /* UGLY WARNING */ - G.is_rendering = FALSE; + G.is_rendering = false; } void RE_PreviewRender(Render *re, Main *bmain, Scene *sce) @@ -2972,10 +2977,11 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce) /* note; repeated win/disprect calc... solve that nicer, also in compo */ /* only the temp file! */ -int RE_ReadRenderResult(Scene *scene, Scene *scenode) +bool RE_ReadRenderResult(Scene *scene, Scene *scenode) { Render *re; - int winx, winy, success; + int winx, winy; + bool success; rcti disprect; /* calculate actual render result and display size */ @@ -3073,7 +3079,7 @@ void RE_result_load_from_file(RenderResult *result, ReportList *reports, const c const float default_envmap_layout[] = { 0, 0, 1, 0, 2, 0, 0, 1, 1, 1, 2, 1 }; -int RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env, const char *relpath, const char imtype, float layout[12]) +bool RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env, const char *relpath, const char imtype, float layout[12]) { ImageFormatData imf; ImBuf *ibuf = NULL; @@ -3124,11 +3130,11 @@ int RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env, IMB_freeImBuf(ibuf); if (ok) { - return TRUE; + return true; } else { BKE_report(reports, RPT_ERROR, "Error writing environment map"); - return FALSE; + return false; } } diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index 661c8dec5ef..0c3da335963 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -567,7 +567,7 @@ void shadeSunView(float col_r[3], const float view[3]) GroupObject *go; LampRen *lar; float sview[3]; - int do_init = TRUE; + bool do_init = true; for (go=R.lights.first; go; go= go->next) { lar= go->lampren; @@ -582,11 +582,11 @@ void shadeSunView(float col_r[3], const float view[3]) if (sview[2] < 0.0f) sview[2] = 0.0f; normalize_v3(sview); - do_init = FALSE; + do_init = false; } GetSkyXYZRadiancef(lar->sunsky, sview, colorxyz); - xyz_to_rgb(colorxyz[0], colorxyz[1], colorxyz[2], &sun_collector[0], &sun_collector[1], &sun_collector[2], + xyz_to_rgb(colorxyz[0], colorxyz[1], colorxyz[2], &sun_collector[0], &sun_collector[1], &sun_collector[2], lar->sunsky->sky_colorspace); ramp_blend(lar->sunsky->skyblendtype, col_r, lar->sunsky->skyblendfac, sun_collector); diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index ce87888b6a0..b085ac5812b 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -503,7 +503,7 @@ int pointdensitytex(Tex *tex, const float texvec[3], TexResult *texres) case TEX_PD_COLOR_PARTAGE: if (pd->coba) { if (do_colorband(pd->coba, age, col)) { - texres->talpha = TRUE; + texres->talpha = true; copy_v3_v3(&texres->tr, col); texres->tin *= col[3]; texres->ta = texres->tin; @@ -516,7 +516,7 @@ int pointdensitytex(Tex *tex, const float texvec[3], TexResult *texres) if (pd->coba) { if (do_colorband(pd->coba, speed, col)) { - texres->talpha = TRUE; + texres->talpha = true; copy_v3_v3(&texres->tr, col); texres->tin *= col[3]; texres->ta = texres->tin; @@ -525,7 +525,7 @@ int pointdensitytex(Tex *tex, const float texvec[3], TexResult *texres) break; } case TEX_PD_COLOR_PARTVEL: - texres->talpha = TRUE; + texres->talpha = true; mul_v3_fl(vec, pd->speed_scale); copy_v3_v3(&texres->tr, vec); texres->ta = texres->tin; diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index ed2c7455250..60327c7db8d 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -749,7 +749,7 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, con shi.lay= origshi->lay; shi.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */ shi.combinedflag= 0xFFFFFF; /* ray trace does all options */ - //shi.do_preview = FALSE; // memset above, so don't need this + //shi.do_preview = false; // memset above, so don't need this shi.light_override= origshi->light_override; shi.mat_override= origshi->mat_override; @@ -1205,13 +1205,13 @@ static QMCSampler *get_thread_qmcsampler(Render *re, int thread, int type, int t for (qsa=re->qmcsamplers[thread].first; qsa; qsa=qsa->next) { if (qsa->type == type && qsa->tot == tot && !qsa->used) { - qsa->used = TRUE; + qsa->used = true; return qsa; } } qsa= QMC_initSampler(type, tot); - qsa->used = TRUE; + qsa->used = true; BLI_addtail(&re->qmcsamplers[thread], qsa); return qsa; @@ -2156,7 +2156,8 @@ static void ray_shadow_qmc(ShadeInput *shi, LampRen *lar, const float lampco[3], float adapt_thresh = lar->adapt_thresh; int min_adapt_samples=4, max_samples = lar->ray_totsamp; float start[3]; - int do_soft = TRUE, full_osa = FALSE, i; + bool do_soft = true, full_osa = false; + int i; float min[3], max[3]; RayHint bb_hint; @@ -2171,8 +2172,8 @@ static void ray_shadow_qmc(ShadeInput *shi, LampRen *lar, const float lampco[3], else shadfac[3]= 1.0f; - if (lar->ray_totsamp < 2) do_soft = FALSE; - if ((R.r.mode & R_OSA) && (R.osa > 0) && (shi->vlr->flag & R_FULL_OSA)) full_osa = TRUE; + if (lar->ray_totsamp < 2) do_soft = false; + if ((R.r.mode & R_OSA) && (R.osa > 0) && (shi->vlr->flag & R_FULL_OSA)) full_osa = true; if (full_osa) { if (do_soft) max_samples = max_samples/R.osa + 1; diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index f2c5a7597b8..f27bd3a8292 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -471,7 +471,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rr->tilerect.ymax = partrct->ymax - re->disprect.ymin; if (savebuffers) { - rr->do_exr_tile = TRUE; + rr->do_exr_tile = true; } /* check renderdata for amount of layers */ @@ -664,7 +664,7 @@ static void ml_addpass_cb(void *UNUSED(base), void *lay, const char *str, float } /* from imbuf, if a handle was returned we convert this to render result */ -RenderResult *render_result_new_from_exr(void *exrhandle, const char *colorspace, int predivide, int rectx, int recty) +RenderResult *render_result_new_from_exr(void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty) { RenderResult *rr = MEM_callocN(sizeof(RenderResult), __func__); RenderLayer *rl; @@ -771,12 +771,12 @@ static char *make_pass_name(RenderPass *rpass, int chan) /* filename already made absolute */ /* called from within UI, saves both rendered result as a file-read result */ -int RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *filename, int compress) +bool RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *filename, int compress) { RenderLayer *rl; RenderPass *rpass; void *exrhandle = IMB_exr_get_handle(); - int success; + bool success; BLI_make_existing_file(filename); @@ -819,12 +819,12 @@ int RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *file /* when the filename has no permissions, this can fail */ if (IMB_exr_begin_write(exrhandle, filename, rr->rectx, rr->recty, compress)) { IMB_exr_write_channels(exrhandle); - success = TRUE; + success = true; } else { /* TODO, get the error from openexr's exception */ BKE_report(reports, RPT_ERROR, "Error writing render result (see console)"); - success = FALSE; + success = false; } IMB_exr_close(exrhandle); @@ -1001,7 +1001,7 @@ void render_result_exr_file_end(Render *re) rl->exrhandle = NULL; } - rr->do_exr_tile = FALSE; + rr->do_exr_tile = false; } render_result_free_list(&re->fullresult, re->result); @@ -1036,7 +1036,7 @@ int render_result_exr_file_read(Render *re, int sample) { RenderLayer *rl; char str[FILE_MAX]; - int success = TRUE; + bool success = true; RE_FreeRenderResult(re->result); re->result = render_result_new(re, &re->disprect, 0, RR_USE_MEM, RR_ALL_LAYERS); @@ -1048,7 +1048,7 @@ int render_result_exr_file_read(Render *re, int sample) if (!render_result_exr_file_read_path(re->result, rl, str)) { printf("cannot read: %s\n", str); - success = FALSE; + success = false; } } diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index ce1f1467393..3ed216518de 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -1103,7 +1103,7 @@ static int multitex(Tex *tex, float texvec[3], float dxt[3], float dyt[3], int o float tmpvec[3]; int retval = 0; /* return value, int:0, col:1, nor:2, everything:3 */ - texres->talpha = FALSE; /* is set when image texture returns alpha (considered premul) */ + texres->talpha = false; /* is set when image texture returns alpha (considered premul) */ if (tex->use_nodes && tex->nodetree) { retval = ntreeTexExecTree(tex->nodetree, texres, texvec, dxt, dyt, osatex, thread, @@ -1200,7 +1200,7 @@ static int multitex(Tex *tex, float texvec[3], float dxt[3], float dyt[3], int o if (tex->flag & TEX_COLORBAND) { float col[4]; if (do_colorband(tex->coba, texres->tin, col)) { - texres->talpha = TRUE; + texres->talpha = true; texres->tr= col[0]; texres->tg= col[1]; texres->tb= col[2]; @@ -1326,7 +1326,7 @@ int multitex_ext_safe(Tex *tex, float texvec[3], TexResult *texres, struct Image { int use_nodes= tex->use_nodes, retval; - tex->use_nodes = FALSE; + tex->use_nodes = false; retval= multitex_nodes_intern(tex, texvec, NULL, NULL, 0, texres, 0, 0, NULL, NULL, pool, scene_color_manage); tex->use_nodes= use_nodes; @@ -1642,7 +1642,7 @@ static void texco_mapping(ShadeInput *shi, Tex *tex, MTex *mtex, typedef struct CompatibleBump { float nu[3], nv[3], nn[3]; float dudnu, dudnv, dvdnu, dvdnv; - int nunvdone; + bool nunvdone; } CompatibleBump; static void compatible_bump_init(CompatibleBump *compat_bump) @@ -1679,7 +1679,7 @@ static void compatible_bump_uv_derivs(CompatibleBump *compat_bump, ShadeInput *s compat_bump->nn[1] = -shi->vn[1]; compat_bump->nn[2] = -shi->vn[2]; ortho_basis_v3v3_v3(compat_bump->nu, compat_bump->nv, compat_bump->nn); - compat_bump->nunvdone = TRUE; + compat_bump->nunvdone = true; } if (tf) { @@ -1733,7 +1733,7 @@ static int compatible_bump_compute(CompatibleBump *compat_bump, ShadeInput *shi, /* render normal is negated */ negate_v3_v3(compat_bump->nn, shi->vn); ortho_basis_v3v3_v3(compat_bump->nu, compat_bump->nv, compat_bump->nn); - compat_bump->nunvdone = TRUE; + compat_bump->nunvdone = true; } /* two methods, either constant based on main image resolution, @@ -1916,7 +1916,7 @@ static int ntap_bump_compute(NTapBump *ntap_bump, ShadeInput *shi, MTex *mtex, T ntap_bump->fPrevMagnitude = 1.0f; ntap_bump->iPrevBumpSpace = 0; - ntap_bump->init_done = TRUE; + ntap_bump->init_done = true; } /* resolve image dimensions */ @@ -2142,10 +2142,10 @@ void do_material_tex(ShadeInput *shi, Render *re) float *co = NULL, *dx = NULL, *dy = NULL; float fact, facm, factt, facmm, stencilTin=1.0; float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3], warpvec[3]={0.0f, 0.0f, 0.0f}, Tnor=1.0; - int tex_nr, rgbnor= 0, warp_done = FALSE; - int use_compat_bump = FALSE, use_ntap_bump = FALSE; - int found_nmapping = 0, found_deriv_map = 0; - int iFirstTimeNMap=1; + int tex_nr, rgbnor= 0; + bool warp_done = false, use_compat_bump = false, use_ntap_bump = false; + bool found_nmapping = false, found_deriv_map = false; + bool iFirstTimeNMap = true; compatible_bump_init(&compat_bump); ntap_bump_init(&ntap_bump); @@ -2165,25 +2165,25 @@ void do_material_tex(ShadeInput *shi, Render *re) if (tex == NULL) continue; found_deriv_map = (tex->type==TEX_IMAGE) && (tex->imaflag & TEX_DERIVATIVEMAP); - use_compat_bump= (mtex->texflag & MTEX_COMPAT_BUMP); - use_ntap_bump = ((mtex->texflag & (MTEX_3TAP_BUMP|MTEX_5TAP_BUMP|MTEX_BICUBIC_BUMP))!=0 || found_deriv_map!=0) ? TRUE : FALSE; + use_compat_bump= (mtex->texflag & MTEX_COMPAT_BUMP) != 0; + use_ntap_bump = ((mtex->texflag & (MTEX_3TAP_BUMP|MTEX_5TAP_BUMP|MTEX_BICUBIC_BUMP))!=0 || found_deriv_map!=0) ? true : false; /* XXX texture node trees don't work for this yet */ if (tex->nodetree && tex->use_nodes) { - use_compat_bump = FALSE; - use_ntap_bump = FALSE; + use_compat_bump = false; + use_ntap_bump = false; } /* case displacement mapping */ if (shi->osatex == 0 && use_ntap_bump) { - use_ntap_bump = FALSE; - use_compat_bump = TRUE; + use_ntap_bump = false; + use_compat_bump = true; } /* case ocean */ if (tex->type == TEX_OCEAN) { - use_ntap_bump = FALSE; - use_compat_bump = FALSE; + use_ntap_bump = false; + use_compat_bump = false; } /* which coords */ @@ -2381,7 +2381,7 @@ void do_material_tex(ShadeInput *shi, Render *re) warpvec[0]= mtex->warpfac*warpnor[0]; warpvec[1]= mtex->warpfac*warpnor[1]; warpvec[2]= mtex->warpfac*warpnor[2]; - warp_done = TRUE; + warp_done = true; } #if 0 if (mtex->texflag & MTEX_VIEWSPACE) { @@ -2476,8 +2476,8 @@ void do_material_tex(ShadeInput *shi, Render *re) if (mtex->normapspace == MTEX_NSPACE_TANGENT) { /* qdn: tangent space */ float B[3], tv[3]; - const float * no = iFirstTimeNMap!=0 ? shi->nmapnorm : shi->vn; - iFirstTimeNMap=0; + const float *no = iFirstTimeNMap ? shi->nmapnorm : shi->vn; + iFirstTimeNMap = false; cross_v3_v3v3(B, no, shi->nmaptang); /* bitangent */ mul_v3_fl(B, shi->nmaptang[3]); /* transform norvec from tangent space to object surface in camera space */ diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index a6f37f2670c..63fcafe2cc0 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -698,7 +698,8 @@ static void sky_tile(RenderPart *pa, RenderLayer *rl) for (y=pa->disprect.ymin; y<pa->disprect.ymax; y++) { for (x=pa->disprect.xmin; x<pa->disprect.xmax; x++, od+=4) { float col[4]; - int sample, done = FALSE; + int sample; + bool done = false; for (sample= 0; sample<totsample; sample++) { float *pass= rlpp[sample]->rectf + od; @@ -707,7 +708,7 @@ static void sky_tile(RenderPart *pa, RenderLayer *rl) if (done==0) { shadeSkyPixel(col, x, y, pa->thread); - done = TRUE; + done = true; } if (pass[3]==0.0f) { @@ -765,7 +766,7 @@ static void atm_tile(RenderPart *pa, RenderLayer *rl) float *zrect= RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_Z) + od; float *rgbrect = rlpp[sample]->rectf + 4*od; float rgb[3] = {0}; - int done = FALSE; + bool done = false; for (go=R.lights.first; go; go= go->next) { @@ -797,7 +798,7 @@ static void atm_tile(RenderPart *pa, RenderLayer *rl) if (done==0) { copy_v3_v3(rgb, tmp_rgb); - done = TRUE; + done = true; } else { rgb[0] = 0.5f*rgb[0] + 0.5f*tmp_rgb[0]; @@ -1961,7 +1962,7 @@ void add_halo_flare(Render *re) /* for now, we get the first renderlayer in list with halos set */ for (rl= rr->layers.first; rl; rl= rl->next) { - int do_draw = FALSE; + bool do_draw = false; if ((rl->layflag & SCE_LAY_HALO) == 0) continue; @@ -1977,7 +1978,7 @@ void add_halo_flare(Render *re) har= R.sortedhalos[a]; if (har->flarec && (har->lay & rl->lay)) { - do_draw = TRUE; + do_draw = true; renderflare(rr, rl->rectf, har); } } diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 9a1ee91d1f0..0d5b0b920b4 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -1234,13 +1234,13 @@ HaloRen *RE_inithalo_particle(Render *re, ObjectRen *obr, DerivedMesh *dm, Mater /* -------------------------- operations on entire database ----------------------- */ /* ugly function for halos in panorama */ -static int panotestclip(Render *re, int do_pano, float v[4]) +static int panotestclip(Render *re, bool do_pano, float v[4]) { /* part size (ensure we run RE_parts_clamp first) */ BLI_assert(re->partx == min_ii(re->r.tilex, re->rectx)); BLI_assert(re->party == min_ii(re->r.tiley, re->recty)); - if (do_pano == FALSE) { + if (do_pano == false) { return testclip(v); } else { @@ -1278,7 +1278,7 @@ static int panotestclip(Render *re, int do_pano, float v[4]) void project_renderdata(Render *re, void (*projectfunc)(const float *, float mat[4][4], float *), - int do_pano, float xoffs, int UNUSED(do_buckets)) + bool do_pano, float xoffs, bool UNUSED(do_buckets)) { ObjectRen *obr; HaloRen *har = NULL; diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 4f41f2729a1..cc781c863a0 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -181,7 +181,8 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) double a, b, c, disc, nray[3], npos[3]; double t0, t1 = 0.0f, t2= 0.0f, t3; float p1[3], p2[3], ladist, maxz = 0.0f, maxy = 0.0f, haint; - int cuts, do_clip = TRUE, use_yco = FALSE; + int cuts; + bool do_clip = true, use_yco = false; *intens= 0.0f; haint= lar->haint; @@ -217,7 +218,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) /* rotate maxz */ if (shi->co[2]==0.0f) { - do_clip = FALSE; /* for when halo at sky */ + do_clip = false; /* for when halo at sky */ } else { p1[0]= shi->co[0]-lar->co[0]; @@ -229,7 +230,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) maxy= lar->imat[0][1]*p1[0]+lar->imat[1][1]*p1[1]+lar->imat[2][1]*p1[2]; if (fabs(nray[2]) < FLT_EPSILON) { - use_yco = TRUE; + use_yco = true; } } @@ -285,7 +286,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) if (ok1==0 && ok2==0) return; /* intersction point with -ladist, the bottom of the cone */ - if (use_yco == FALSE) { + if (use_yco == false) { t3= ((double)(-ladist)-npos[2])/nray[2]; /* de we have to replace one of the intersection points? */ @@ -319,7 +320,7 @@ static void spothalo(struct LampRen *lar, ShadeInput *shi, float *intens) /* calculate t0: is the maximum visible z (when halo is intersected by face) */ if (do_clip) { - if (use_yco == FALSE) t0 = ((double)maxz - npos[2]) / nray[2]; + if (use_yco == false) t0 = ((double)maxz - npos[2]) / nray[2]; else t0 = ((double)maxy - npos[1]) / nray[1]; if (t0 < t1) return; diff --git a/source/blender/render/intern/source/texture_ocean.c b/source/blender/render/intern/source/texture_ocean.c index 0d68c40be0f..bfd155eba62 100644 --- a/source/blender/render/intern/source/texture_ocean.c +++ b/source/blender/render/intern/source/texture_ocean.c @@ -83,7 +83,7 @@ int ocean_texture(Tex *tex, const float texvec[2], TexResult *texres) const float u = 0.5f + 0.5f * texvec[0]; const float v = 0.5f + 0.5f * texvec[1]; - if (omd->oceancache && omd->cached == TRUE) { + if (omd->oceancache && omd->cached == true) { CLAMP(cfra, omd->bakestart, omd->bakeend); cfra -= omd->bakestart; /* shift to 0 based */ diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 0936d5fcef9..24e32817a97 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -70,7 +70,7 @@ #include "texture.h" #include "voxeldata.h" -static int is_vd_res_ok(VoxelData *vd) +static bool is_vd_res_ok(VoxelData *vd) { /* arbitrary large value so corrupt headers don't break */ const int min = 1, max = 100000; @@ -90,7 +90,7 @@ static int load_frame_blendervoxel(VoxelData *vd, FILE *fp, int frame) const size_t size = vd_resol_size(vd); size_t offset = sizeof(VoxelDataHeader); - if (is_vd_res_ok(vd) == FALSE) + if (is_vd_res_ok(vd) == false) return 0; vd->dataset = MEM_mapallocN(sizeof(float) * size, "voxel dataset"); @@ -112,7 +112,7 @@ static int load_frame_raw8(VoxelData *vd, FILE *fp, int frame) size_t i; char *data_c; - if (is_vd_res_ok(vd) == FALSE) + if (is_vd_res_ok(vd) == false) return 0; vd->dataset = MEM_mapallocN(sizeof(float) * size, "voxel dataset"); diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index a74d6efbc0b..d50d53b5f53 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -4007,7 +4007,7 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas if (R.osa > 16) { /* MAX_OSA */ printf("zbuffer_transp_shade: osa too large\n"); - G.is_break = TRUE; + G.is_break = true; return NULL; } |