diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-17 14:48:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-17 14:48:13 +0400 |
commit | 8480bb64ec7e5f367b914dc46e9c929945a6ebb0 (patch) | |
tree | 3c7a2982a001dd9efb9b99115454576906815637 /intern | |
parent | 930765faa81efe3894e5476a59f5f3298da54ae4 (diff) |
Code cleanup: style
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 2 | ||||
-rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 10bcbf6a63e..998531a577b 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -877,7 +877,7 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node) SubdParams sdparams(mesh, shader, smooth); xml_read_float(&sdparams.dicing_rate, node, "dicing_rate"); - DiagSplit dsplit(sdparams);; + DiagSplit dsplit(sdparams); sdmesh.tessellate(&dsplit); } else { diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 61c6ef6af1b..0972cf6a939 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -414,7 +414,7 @@ static void create_subd_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, PointerR //sdparams.camera = scene->camera; /* tesselate */ - DiagSplit dsplit(sdparams);; + DiagSplit dsplit(sdparams); sdmesh.tessellate(&dsplit); } diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 2ac01a6c7e4..4d00616202e 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -43,7 +43,7 @@ size_t (*MEM_allocN_len)(const void *vmemh) = MEM_lockfree_allocN_len; void (*MEM_freeN)(void *vmemh) = MEM_lockfree_freeN; void *(*MEM_dupallocN)(const void *vmemh) = MEM_lockfree_dupallocN; void *(*MEM_reallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_reallocN_id; -void *(*MEM_recallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_recallocN_id;; +void *(*MEM_recallocN_id)(void *vmemh, size_t len, const char *str) = MEM_lockfree_recallocN_id; void *(*MEM_callocN)(size_t len, const char *str) = MEM_lockfree_callocN; void *(*MEM_mallocN)(size_t len, const char *str) = MEM_lockfree_mallocN; void *(*MEM_mapallocN)(size_t len, const char *str) = MEM_lockfree_mapallocN; @@ -71,7 +71,7 @@ void MEM_use_guarded_allocator(void) MEM_freeN = MEM_guarded_freeN; MEM_dupallocN = MEM_guarded_dupallocN; MEM_reallocN_id = MEM_guarded_reallocN_id; - MEM_recallocN_id = MEM_guarded_recallocN_id;; + MEM_recallocN_id = MEM_guarded_recallocN_id; MEM_callocN = MEM_guarded_callocN; MEM_mallocN = MEM_guarded_mallocN; MEM_mapallocN = MEM_guarded_mapallocN; |