From cf5154dcff622f8675a22d044d29b1c00b788e76 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 1 Nov 2015 12:32:04 +1100 Subject: Cleanup: old comments --- source/blender/blenkernel/intern/customdata.c | 1 - source/blender/blenkernel/intern/sequencer.c | 2 -- source/blender/editors/mesh/editmesh_utils.c | 2 -- source/blender/editors/screen/screen_edit.c | 13 +------------ source/blender/editors/space_view3d/view3d_draw.c | 5 ----- source/blender/editors/space_view3d/view3d_edit.c | 2 -- source/blender/editors/space_view3d/view3d_view.c | 2 -- source/blender/editors/transform/transform_constraints.c | 5 ----- source/blender/editors/transform/transform_conversions.c | 6 ------ source/blender/render/intern/source/shadeoutput.c | 2 +- 10 files changed, 2 insertions(+), 38 deletions(-) diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 88ab6340184..eb604275acc 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1318,7 +1318,6 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { {sizeof(short[2]), "vec2s", 1, NULL, NULL, NULL, NULL, NULL, NULL}, }; -/* note, numbers are from trunk and need updating for bmesh */ static const char *LAYERTYPENAMES[CD_NUMTYPES] = { /* 0-4 */ "CDMVert", "CDMSticky", "CDMDeformVert", "CDMEdge", "CDMFace", diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index c11f3e880b0..4a24b149c34 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3297,8 +3297,6 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq } } MEM_freeN(ibufs_arr); - - // BIF_end_render_callbacks(); } diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index c101b416169..f102cf2b259 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -764,8 +764,6 @@ UvMapVert *BM_uv_vert_map_at_index(UvVertMap *vmap, unsigned int v) return vmap->vert[v]; } -/* from editmesh_lib.c in trunk */ - /* A specialized vert map used by stitch operator */ UvElementMap *BM_uv_element_map_create( diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 22f90e5b36d..e981a5ec7c0 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -2121,8 +2121,6 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, int UNUSED(mute)) } } #endif - - //extern void audiostream_scrub(unsigned int frame); /* seqaudio.c */ ED_clip_update_frame(bmain, scene->r.cfra); @@ -2132,16 +2130,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, int UNUSED(mute)) /* this function applies the changes too */ BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, layers); - - //if ((CFRA > 1) && (!mute) && (scene->r.audio.flag & AUDIO_SCRUB)) - // audiostream_scrub( CFRA ); - - /* 3d window, preview */ - //BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT); - - /* all movie/sequence images */ - //BIF_image_update_frame(); - + /* composite */ if (scene->use_nodes && scene->nodetree) ntreeCompositTagAnimated(scene->nodetree); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 01398c8335b..40cd91a6e2f 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1427,10 +1427,6 @@ static void backdrawview3d(Scene *scene, ARegion *ar, View3D *v3d) if (rv3d->rflag & RV3D_CLIPPING) ED_view3d_clipping_disable(); - - /* it is important to end a view in a transform compatible with buttons */ -// persp(PERSP_WIN); /* set ortho */ - } void view3d_opengl_read_pixels(ARegion *ar, int x, int y, int w, int h, int format, int type, void *data) @@ -2386,7 +2382,6 @@ void ED_view3d_draw_depth(Scene *scene, ARegion *ar, View3D *v3d, bool alphaover glClear(GL_DEPTH_BUFFER_BIT); glLoadMatrixf(rv3d->viewmat); -// persp(PERSP_STORE); /* store correct view for persp(PERSP_VIEW) calls */ if (rv3d->rflag & RV3D_CLIPPING) { ED_view3d_clipping_set(rv3d); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 8f5c9095679..6c39163661b 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3076,8 +3076,6 @@ static int viewselected_exec(bContext *C, wmOperator *op) view3d_from_minmax(C, v3d, ar, min, max, ok_dist, smooth_viewtx); } -// XXX BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT); - return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 19df5e4534a..2e9dcdc9ba6 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -764,7 +764,6 @@ bool ED_view3d_clip_range_get( return params.is_ortho; } -/* also exposed in previewrender.c */ bool ED_view3d_viewplane_get( const View3D *v3d, const RegionView3D *rv3d, int winx, int winy, rctf *r_viewplane, float *r_clipsta, float *r_clipend, float *r_pixsize) @@ -1133,7 +1132,6 @@ short view3d_opengl_select(ViewContext *vc, unsigned int *buffer, unsigned int b v3d->zbuf = 0; glDisable(GL_DEPTH_TEST); } -// XXX persp(PERSP_WIN); if (vc->rv3d->rflag & RV3D_CLIPPING) ED_view3d_clipping_disable(); diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 895c8a81044..f6422446e50 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -673,11 +673,6 @@ void drawConstraint(TransInfo *t) if (t->flag & T_NO_CONSTRAINT) return; - /* nasty exception for Z constraint in camera view */ - // TRANSFORM_FIX_ME -// if ((t->flag & T_OBJECT) && G.vd->camera==OBACT && G.vd->persp==V3D_CAMOB) -// return; - if (tc->drawExtra) { tc->drawExtra(t); } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 110cd4cdd59..52e0ede5cc1 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -6357,12 +6357,6 @@ void special_aftertrans_update(bContext *C, TransInfo *t) } clear_trans_object_base_flags(t); - - -#if 0 // TRANSFORM_FIX_ME - if (resetslowpar) - reset_slowparents(); -#endif } int special_transform_moving(TransInfo *t) diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 27714b26952..7ac11ac6064 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -894,7 +894,7 @@ void calc_R_ref(ShadeInput *shi) } -/* called from ray.c */ +/* called from rayshade.c */ void shade_color(ShadeInput *shi, ShadeResult *shr) { Material *ma= shi->mat; -- cgit v1.2.3