diff options
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface')
5 files changed, 82 insertions, 86 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index e9586e347a2..2018c7a740d 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -35,7 +35,7 @@ #include "BKE_global.h" -BlenderFileLoader::BlenderFileLoader(Render *re, SceneRenderLayer* srl) +BlenderFileLoader::BlenderFileLoader(Render *re, SceneRenderLayer *srl) { _re = re; _srl = srl; @@ -50,7 +50,7 @@ BlenderFileLoader::~BlenderFileLoader() _Scene = NULL; } -NodeGroup* BlenderFileLoader::Load() +NodeGroup *BlenderFileLoader::Load() { ObjectInstanceRen *obi; @@ -582,10 +582,10 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) edgeMarks, em1, false, em4, clip_1); } for (i = 0; i < numTris_1; i++) { - addTriangle(&ls, triCoords[0], triCoords[i+1], triCoords[i+2], - triNormals[0], triNormals[i+1], triNormals[i+2], - fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i+1], - (i == numTris_1 - 1) ? edgeMarks[i+2] : false); + addTriangle(&ls, triCoords[0], triCoords[i + 1], triCoords[i + 2], + triNormals[0], triNormals[i + 1], triNormals[i + 2], + fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i + 1], + (i == numTris_1 - 1) ? edgeMarks[i + 2] : false); _numFacesRead++; } } @@ -600,10 +600,10 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) edgeMarks, em2, em3, false, clip_2); } for (i = 0; i < numTris_2; i++) { - addTriangle(&ls, triCoords[0], triCoords[i+1], triCoords[i+2], - triNormals[0], triNormals[i+1], triNormals[i+2], - fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i+1], - (i == numTris_2 - 1) ? edgeMarks[i+2] : false); + addTriangle(&ls, triCoords[0], triCoords[i + 1], triCoords[i + 2], + triNormals[0], triNormals[i + 1], triNormals[i + 2], + fm, (i == 0) ? edgeMarks[0] : false, edgeMarks[i + 1], + (i == numTris_2 - 1) ? edgeMarks[i + 2] : false); _numFacesRead++; } } @@ -624,12 +624,9 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) GeomCleaner::CleanIndexedVertexArray(normals, nSize, NIndices, niSize, &cleanNormals, &cnSize, &cleanNIndices); // format materials array - FrsMaterial** marray = new FrsMaterial*[meshFrsMaterials.size()]; + FrsMaterial **marray = new FrsMaterial *[meshFrsMaterials.size()]; unsigned int mindex = 0; - for (vector<FrsMaterial>::iterator m = meshFrsMaterials.begin(), mend = meshFrsMaterials.end(); - m!=mend; - ++m) - { + for (vector<FrsMaterial>::iterator m = meshFrsMaterials.begin(), mend = meshFrsMaterials.end(); m != mend; ++m) { marray[mindex] = new FrsMaterial(*m); ++mindex; } @@ -653,11 +650,11 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) for (i = 0; i < viSize; i += 3) { detri_t detri; vi0 = cleanVIndices[i]; - vi1 = cleanVIndices[i+1]; - vi2 = cleanVIndices[i+2]; - Vec3r v0(cleanVertices[vi0], cleanVertices[vi0+1], cleanVertices[vi0+2]); - Vec3r v1(cleanVertices[vi1], cleanVertices[vi1+1], cleanVertices[vi1+2]); - Vec3r v2(cleanVertices[vi2], cleanVertices[vi2+1], cleanVertices[vi2+2]); + vi1 = cleanVIndices[i + 1]; + vi2 = cleanVIndices[i + 2]; + Vec3r v0(cleanVertices[vi0], cleanVertices[vi0 + 1], cleanVertices[vi0 + 2]); + Vec3r v1(cleanVertices[vi1], cleanVertices[vi1 + 1], cleanVertices[vi1 + 2]); + Vec3r v2(cleanVertices[vi2], cleanVertices[vi2 + 1], cleanVertices[vi2 + 2]); if (v0 == v1 || v0 == v2 || v1 == v2) { continue; // do nothing for now } @@ -686,11 +683,11 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) if (i == j) continue; vi0 = cleanVIndices[j]; - vi1 = cleanVIndices[j+1]; - vi2 = cleanVIndices[j+2]; - Vec3r v0(cleanVertices[vi0], cleanVertices[vi0+1], cleanVertices[vi0+2]); - Vec3r v1(cleanVertices[vi1], cleanVertices[vi1+1], cleanVertices[vi1+2]); - Vec3r v2(cleanVertices[vi2], cleanVertices[vi2+1], cleanVertices[vi2+2]); + vi1 = cleanVIndices[j + 1]; + vi2 = cleanVIndices[j + 2]; + Vec3r v0(cleanVertices[vi0], cleanVertices[vi0 + 1], cleanVertices[vi0 + 2]); + Vec3r v1(cleanVertices[vi1], cleanVertices[vi1 + 1], cleanVertices[vi1 + 2]); + Vec3r v2(cleanVertices[vi2], cleanVertices[vi2 + 1], cleanVertices[vi2 + 2]); if (detri.viP == vi0 && (detri.viA == vi1 || detri.viB == vi1)) { detri.v += (v2 - v0); detri.n++; @@ -728,13 +725,13 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) detri_t detri = (*v); if (detri.n == 0) { cleanVertices[detri.viP] = cleanVertices[detri.viA]; - cleanVertices[detri.viP+1] = cleanVertices[detri.viA+1]; - cleanVertices[detri.viP+2] = cleanVertices[detri.viA+2]; + cleanVertices[detri.viP + 1] = cleanVertices[detri.viA + 1]; + cleanVertices[detri.viP + 2] = cleanVertices[detri.viA + 2]; } else if (detri.v.norm() > 0.0) { cleanVertices[detri.viP] += 1.0e-5 * detri.v.x(); - cleanVertices[detri.viP+1] += 1.0e-5 * detri.v.y(); - cleanVertices[detri.viP+2] += 1.0e-5 * detri.v.z(); + cleanVertices[detri.viP + 1] += 1.0e-5 * detri.v.y(); + cleanVertices[detri.viP + 2] += 1.0e-5 * detri.v.z(); } } if (G.debug & G_DEBUG_FREESTYLE) { diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index 316cf93a617..1637a136a8a 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -87,7 +87,7 @@ class LIB_SCENE_GRAPH_EXPORT BlenderFileLoader { public: /*! Builds a MaxFileLoader */ - BlenderFileLoader(Render *re, SceneRenderLayer* srl); + BlenderFileLoader(Render *re, SceneRenderLayer *srl); virtual ~BlenderFileLoader(); /*! Loads the 3D scene and returns a pointer to the scene root node */ diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 254aca35d82..cab6ebff4f2 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -67,7 +67,7 @@ extern "C" { } #endif -BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) : StrokeRenderer() +BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : StrokeRenderer() { // TEMPORARY - need a texture manager _textureManager = new BlenderTextureManager; @@ -128,9 +128,9 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) : Str BKE_scene_set_background(G.main, freestyle_scene); // Camera - Object* object_camera = BKE_object_add(freestyle_scene, OB_CAMERA); + Object *object_camera = BKE_object_add(freestyle_scene, OB_CAMERA); - Camera* camera = (Camera *)object_camera->data; + Camera *camera = (Camera *)object_camera->data; camera->type = CAM_ORTHO; camera->ortho_scale = max(re->rectx, re->recty); camera->clipsta = 0.1f; @@ -172,7 +172,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer() // compositor has finished. // release objects and data blocks - for (Base *b = (Base*)freestyle_scene->base.first; b; b = b->next) { + for (Base *b = (Base *)freestyle_scene->base.first; b; b = b->next) { Object *ob = b->object; void *data = ob->data; char *name = ob->id.name; @@ -192,7 +192,7 @@ BlenderStrokeRenderer::~BlenderStrokeRenderer() freestyle_scene->camera = NULL; break; default: - cerr << "Warning: unexpected object in the scene: " << name[0] << name[1] << ":" << (name+2) << endl; + cerr << "Warning: unexpected object in the scene: " << name[0] << name[1] << ":" << (name + 2) << endl; } } BLI_freelistN(&freestyle_scene->base); @@ -239,9 +239,7 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const unsigned int vertex_index, edge_index, loop_index; Vec2r p; - for (vector<Strip*>::iterator s = strips.begin(), send = strips.end(); - s != send; - ++s){ + for (vector<Strip*>::iterator s = strips.begin(), send = strips.end(); s != send; ++s) { Strip::vertex_container& strip_vertices = (*s)->vertices(); int strip_vertex_count = (*s)->sizeStrip(); int xl, xu, yl, yu, n, visible_faces, visible_segments; @@ -286,11 +284,11 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const //me = Mesh.New() #if 0 - Object* object_mesh = BKE_object_add(freestyle_scene, OB_MESH); + Object *object_mesh = BKE_object_add(freestyle_scene, OB_MESH); #else - Object* object_mesh = NewMesh(); + Object *object_mesh = NewMesh(); #endif - Mesh* mesh = (Mesh*)object_mesh->data; + Mesh *mesh = (Mesh *)object_mesh->data; #if 0 MEM_freeN(mesh->bb); mesh->bb = NULL; @@ -298,10 +296,10 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const #endif #if 1 //me.materials = [mat] - mesh->mat = (Material**)MEM_mallocN(1 * sizeof(Material*), "MaterialList"); + mesh->mat = (Material **)MEM_mallocN(1 * sizeof(Material *), "MaterialList"); mesh->mat[0] = material; mesh->totcol = 1; - test_object_materials((ID*)mesh); + test_object_materials((ID *)mesh); #else assign_material(object_mesh, material, object_mesh->totcol + 1); object_mesh->actcol = object_mesh->totcol; @@ -309,22 +307,22 @@ void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const // vertices allocation mesh->totvert = visible_faces + visible_segments * 2; - mesh->mvert = (MVert*)CustomData_add_layer(&mesh->vdata, CD_MVERT, CD_CALLOC, NULL, mesh->totvert); + mesh->mvert = (MVert *)CustomData_add_layer(&mesh->vdata, CD_MVERT, CD_CALLOC, NULL, mesh->totvert); // edges allocation mesh->totedge = visible_faces * 2 + visible_segments; - mesh->medge = (MEdge*)CustomData_add_layer(&mesh->edata, CD_MEDGE, CD_CALLOC, NULL, mesh->totedge); + mesh->medge = (MEdge *)CustomData_add_layer(&mesh->edata, CD_MEDGE, CD_CALLOC, NULL, mesh->totedge); // faces allocation mesh->totpoly = visible_faces; - mesh->mpoly = (MPoly*)CustomData_add_layer(&mesh->pdata, CD_MPOLY, CD_CALLOC, NULL, mesh->totpoly); + mesh->mpoly = (MPoly *)CustomData_add_layer(&mesh->pdata, CD_MPOLY, CD_CALLOC, NULL, mesh->totpoly); // loops allocation mesh->totloop = visible_faces * 3; - mesh->mloop = (MLoop*)CustomData_add_layer(&mesh->ldata, CD_MLOOP, CD_CALLOC, NULL, mesh->totloop); + mesh->mloop = (MLoop *)CustomData_add_layer(&mesh->ldata, CD_MLOOP, CD_CALLOC, NULL, mesh->totloop); // colors allocation - mesh->mloopcol = (MLoopCol*)CustomData_add_layer(&mesh->ldata, CD_MLOOPCOL, CD_CALLOC, NULL, mesh->totloop); + mesh->mloopcol = (MLoopCol *)CustomData_add_layer(&mesh->ldata, CD_MLOOPCOL, CD_CALLOC, NULL, mesh->totloop); //////////////////// // Data copy @@ -503,9 +501,9 @@ Object *BlenderStrokeRenderer::NewMesh() const return ob; } -Render* BlenderStrokeRenderer::RenderScene(Render *re) +Render *BlenderStrokeRenderer::RenderScene(Render *re) { - Camera *camera = (Camera*)freestyle_scene->camera->data; + Camera *camera = (Camera *)freestyle_scene->camera->data; if (camera->clipend < _z) camera->clipend = _z + _z_delta * 100.0f; #if 0 diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h index 7a1ce0a082b..51eaf4fe504 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h @@ -62,7 +62,7 @@ public: protected: virtual int interpret() { - PythonInterpreter* py_inter = dynamic_cast<PythonInterpreter*>(_inter); + PythonInterpreter *py_inter = dynamic_cast<PythonInterpreter*>(_inter); assert(py_inter != 0); return py_inter->interpretText(_text, getFileName()); } diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index fdff9db3d60..f6f97bda1bf 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -206,7 +206,7 @@ static void init_camera(Render *re) static char *escape_quotes(char *name) { - char *s = (char*)MEM_mallocN(strlen(name) * 2 + 1, "escape_quotes"); + char *s = (char *)MEM_mallocN(strlen(name) * 2 + 1, "escape_quotes"); char *p = s; while (*name) { if (*name == '\'') @@ -323,13 +323,13 @@ static void prepare(Render *re, SceneRenderLayer *srl) if (G.debug & G_DEBUG_FREESTYLE) { cout << "Modules :" << endl; } - for (FreestyleModuleConfig *module_conf = (FreestyleModuleConfig*)config->modules.first; + for (FreestyleModuleConfig *module_conf = (FreestyleModuleConfig *)config->modules.first; module_conf; module_conf = module_conf->next) { - if(module_conf->is_displayed) { + if (module_conf->is_displayed) { if (G.debug & G_DEBUG_FREESTYLE) { - cout << " " << layer_count+1 << ": " << module_conf->module_path << endl; + cout << " " << layer_count + 1 << ": " << module_conf->module_path << endl; } controller->InsertStyleModule(layer_count, module_conf->module_path); controller->toggleLayer(layer_count, true); @@ -362,14 +362,14 @@ static void prepare(Render *re, SceneRenderLayer *srl) if (G.debug & G_DEBUG_FREESTYLE) { cout << "Linesets:" << endl; } - for (FreestyleLineSet *lineset = (FreestyleLineSet*)config->linesets.first; + for (FreestyleLineSet *lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) { if (lineset->flags & FREESTYLE_LINESET_ENABLED) { if (G.debug & G_DEBUG_FREESTYLE) { - cout << " " << layer_count+1 << ": " << lineset->name << " - " - << lineset->linestyle->id.name+2 << endl; + cout << " " << layer_count+1 << ": " << lineset->name << " - " << + lineset->linestyle->id.name + 2 << endl; } Text *text = create_lineset_handler(srl->name, lineset->name); controller->InsertStyleModule(layer_count, lineset->name, text); @@ -444,21 +444,21 @@ static void prepare(Render *re, SceneRenderLayer *srl) cout << "Crease angle : " << controller->getCreaseAngle() << endl; cout << "Sphere radius : " << controller->getSphereRadius() << endl; cout << "Face smoothness : " << (controller->getFaceSmoothness() ? "enabled" : "disabled") << endl; - cout << "Redges and valleys : " << (controller->getComputeRidgesAndValleysFlag() ? "enabled" : "disabled") - << endl; - cout << "Suggestive contours : " << (controller->getComputeSuggestiveContoursFlag() ? "enabled" : "disabled") - << endl; - cout << "Suggestive contour Kr derivative epsilon : " << controller->getSuggestiveContourKrDerivativeEpsilon() - << endl; - cout << "Material boundaries : " << (controller->getComputeMaterialBoundariesFlag() ? "enabled" : "disabled") - << endl; + cout << "Redges and valleys : " << (controller->getComputeRidgesAndValleysFlag() ? "enabled" : "disabled") << + endl; + cout << "Suggestive contours : " << + (controller->getComputeSuggestiveContoursFlag() ? "enabled" : "disabled") << endl; + cout << "Suggestive contour Kr derivative epsilon : " << + controller->getSuggestiveContourKrDerivativeEpsilon() << endl; + cout << "Material boundaries : " << + (controller->getComputeMaterialBoundariesFlag() ? "enabled" : "disabled") << endl; cout << endl; } // set diffuse and z depth passes RenderLayer *rl = RE_GetRenderLayer(re->result, srl->name); bool diffuse = false, z = false; - for (RenderPass *rpass = (RenderPass*)rl->passes.first; rpass; rpass = rpass->next) { + for (RenderPass *rpass = (RenderPass *)rl->passes.first; rpass; rpass = rpass->next) { switch (rpass->passtype) { case SCE_PASS_DIFFUSE: controller->setPassDiffuse(rpass->rect, rpass->rectx, rpass->recty); @@ -483,7 +483,7 @@ static void prepare(Render *re, SceneRenderLayer *srl) controller->ComputeViewMap(); } -void FRS_composite_result(Render* re, SceneRenderLayer* srl, Render* freestyle_render) +void FRS_composite_result(Render *re, SceneRenderLayer *srl, Render *freestyle_render) { RenderLayer *rl; float *src, *dest, *pixSrc, *pixDest; @@ -539,7 +539,7 @@ static int displayed_layer_count(SceneRenderLayer *srl) switch (srl->freestyleConfig.mode) { case FREESTYLE_CONTROL_SCRIPT_MODE: - for (FreestyleModuleConfig *module = (FreestyleModuleConfig*)srl->freestyleConfig.modules.first; + for (FreestyleModuleConfig *module = (FreestyleModuleConfig *)srl->freestyleConfig.modules.first; module; module = module->next) { @@ -548,7 +548,7 @@ static int displayed_layer_count(SceneRenderLayer *srl) } break; case FREESTYLE_CONTROL_EDITOR_MODE: - for (FreestyleLineSet *lineset = (FreestyleLineSet*)srl->freestyleConfig.linesets.first; + for (FreestyleLineSet *lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) { @@ -630,7 +630,8 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl) return freestyle_render; } -void FRS_finish_stroke_rendering(Render *re) { +void FRS_finish_stroke_rendering(Render *re) +{ // clear canvas controller->Clear(); } @@ -656,7 +657,7 @@ void FRS_free_freestyle_config(FreestyleConfig *config) { FreestyleLineSet *lineset; - for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) { + for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) { if (lineset->group) { lineset->group->id.us--; lineset->group = NULL; @@ -681,17 +682,17 @@ void FRS_copy_freestyle_config(FreestyleConfig *new_config, FreestyleConfig *con new_config->crease_angle = config->crease_angle; new_config->linesets.first = new_config->linesets.last = NULL; - for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) { + for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) { new_lineset = FRS_alloc_lineset(); copy_lineset(new_lineset, lineset); - BLI_addtail(&new_config->linesets, (void*)new_lineset); + BLI_addtail(&new_config->linesets, (void *)new_lineset); } new_config->modules.first = new_config->modules.last = NULL; - for (module = (FreestyleModuleConfig*)config->modules.first; module; module = module->next) { + for (module = (FreestyleModuleConfig *)config->modules.first; module; module = module->next) { new_module = FRS_alloc_module(); copy_module(new_module, module); - BLI_addtail(&new_config->modules, (void*)new_module); + BLI_addtail(&new_config->modules, (void *)new_module); } } @@ -715,14 +716,14 @@ static void copy_lineset(FreestyleLineSet *new_lineset, FreestyleLineSet *linese FreestyleModuleConfig *FRS_alloc_module() { - return (FreestyleModuleConfig*)MEM_callocN(sizeof(FreestyleModuleConfig), "style module configuration"); + return (FreestyleModuleConfig *)MEM_callocN(sizeof(FreestyleModuleConfig), "style module configuration"); } void FRS_add_module(FreestyleConfig *config) { - FreestyleModuleConfig *module_conf = (FreestyleModuleConfig*)MEM_callocN(sizeof(FreestyleModuleConfig), - "style module configuration"); - BLI_addtail(&config->modules, (void*)module_conf); + FreestyleModuleConfig *module_conf = (FreestyleModuleConfig *)MEM_callocN(sizeof(FreestyleModuleConfig), + "style module configuration"); + BLI_addtail(&config->modules, (void *)module_conf); strcpy(module_conf->module_path, default_module_path.c_str()); module_conf->is_displayed = 1; @@ -759,7 +760,7 @@ static void unique_lineset_name(FreestyleConfig *config, FreestyleLineSet *lines FreestyleLineSet *FRS_alloc_lineset() { - return (FreestyleLineSet*)MEM_callocN(sizeof(FreestyleLineSet), "Freestyle line set"); + return (FreestyleLineSet *)MEM_callocN(sizeof(FreestyleLineSet), "Freestyle line set"); } FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config) @@ -767,7 +768,7 @@ FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config) int lineset_index = BLI_countlist(&config->linesets); FreestyleLineSet *lineset = FRS_alloc_lineset(); - BLI_addtail(&config->linesets, (void*)lineset); + BLI_addtail(&config->linesets, (void *)lineset); FRS_set_active_lineset_index(config, lineset_index); lineset->linestyle = FRS_new_linestyle("LineStyle", NULL); @@ -880,7 +881,7 @@ FreestyleLineSet *FRS_get_active_lineset(FreestyleConfig *config) { FreestyleLineSet *lineset; - for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) { + for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) { if (lineset->flags & FREESTYLE_LINESET_CURRENT) return lineset; } @@ -892,7 +893,7 @@ short FRS_get_active_lineset_index(FreestyleConfig *config) FreestyleLineSet *lineset; short i; - for (lineset = (FreestyleLineSet*)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) { + for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) { if (lineset->flags & FREESTYLE_LINESET_CURRENT) return i; } @@ -904,7 +905,7 @@ void FRS_set_active_lineset_index(FreestyleConfig *config, short index) FreestyleLineSet *lineset; short i; - for (lineset = (FreestyleLineSet*)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) { + for (lineset = (FreestyleLineSet *)config->linesets.first, i = 0; lineset; lineset = lineset->next, i++) { if (i == index) lineset->flags |= FREESTYLE_LINESET_CURRENT; else @@ -916,7 +917,7 @@ void FRS_unlink_target_object(FreestyleConfig *config, Object *ob) { FreestyleLineSet *lineset; - for (lineset = (FreestyleLineSet*)config->linesets.first; lineset; lineset = lineset->next) { + for (lineset = (FreestyleLineSet *)config->linesets.first; lineset; lineset = lineset->next) { FRS_unlink_linestyle_target_object(lineset->linestyle, ob); } } |