archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-11-11 11:00:55 +00:00
parent c4f332084f
commit 66b488acc3
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -2304,9 +2304,9 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap)
}
/* Don't remap vertices in cddm->mloop, because we need to know the original
indices in order to skip faces with all vertices merged.
The "update loop indices..." section further down remaps vertices in mloop.
*/
* indices in order to skip faces with all vertices merged.
* The "update loop indices..." section further down remaps vertices in mloop.
*/
/* now go through and fix edges and faces */
med = cddm->medge;
@@ -2351,8 +2351,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap)
}
}
if (UNLIKELY(all_vertices_merged))
{
if (UNLIKELY(all_vertices_merged)) {
continue;
}
}

3
source/blender/blenkernel/intern/sequencer.c
View File

@@ -2384,8 +2384,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float
(void)oldmarkers;
#endif
if ((sequencer_view3d_cb && do_seq_gl && camera) && is_thread_main)
{
if ((sequencer_view3d_cb && do_seq_gl && camera) && is_thread_main) {
char err_out[256] = "unknown";
/* for old scened this can be uninitialized,
* should probably be added to do_versions at some point if the functionality stays */

2
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -1140,7 +1140,7 @@ static void rna_ShaderNodeScript_update(Main *bmain, Scene *scene, PointerRNA *p
bNode *node = (bNode *)ptr->data;
RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
if(engine_type && engine_type->update_script_node) {
if (engine_type && engine_type->update_script_node) {
/* auto update node */
RenderEngine *engine = RE_engine_create(engine_type);
engine_type->update_script_node(engine, ntree, node);

4
source/blender/render/intern/source/external_engine.c
View File

@@ -349,7 +349,7 @@ int RE_engine_render(Render *re, int do_all)
re->i.totface = re->i.totvert = re->i.totstrand = re->i.totlamp = re->i.tothalo = 0;
/* render */
if(!re->engine)
if (!re->engine)
re->engine = RE_engine_create(type);
engine = re->engine;
@@ -382,7 +382,7 @@ int RE_engine_render(Render *re, int do_all)
if (type->render)
type->render(engine, re->scene);
if(!(re->r.mode & R_PERSISTENT_DATA)) {
if (!(re->r.mode & R_PERSISTENT_DATA)) {
RE_engine_free(re->engine);
re->engine = NULL;
}