cleanup: typos in comments, style

no functional changes

1 files changed, 86 insertions, 84 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 808408be694..1f30d25b0cc 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -598,10 +598,10 @@ void drawaxes(float size, char drawtype)
 }
 
 
-/* Function to draw an Image on a empty Object */
+/* Function to draw an Image on an empty Object */
 static void draw_empty_image(Object *ob, const short dflag, const unsigned char ob_wire_col[4])
 {
-	Image *ima = (Image *)ob->data;
+	Image *ima = ob->data;
 	ImBuf *ibuf = BKE_image_acquire_ibuf(ima, ob->iuser, NULL);
 
 	float scale, ofs_x, ofs_y, sca_x, sca_y;
@@ -641,7 +641,7 @@ static void draw_empty_image(Object *ob, const short dflag, const unsigned char
 		sca_y = 1.0f;
 	}
 
-	/* Calculate the scale center based on objects origin */
+	/* Calculate the scale center based on object's origin */
 	ofs_x = ob->ima_ofs[0] * ima_x;
 	ofs_y = ob->ima_ofs[1] * ima_y;
 
@@ -944,7 +944,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write, flo
 
 /* ******************** primitive drawing ******************* */
 
-/* draws a cube on given the scaling of the cube, assuming that
+/* draws a cube given the scaling of the cube, assuming that
  * all required matrices have been set (used for drawing empties)
  */
 static void drawcube_size(float size)
@@ -1026,8 +1026,6 @@ static void drawshadbuflimits(Lamp *la, float mat[4][4])
 	glPointSize(1.0);
 }
 
-
-
 static void spotvolume(float lvec[3], float vvec[3], const float inp)
 {
 	/* camera is at 0,0,0 */
@@ -1036,8 +1034,8 @@ static void spotvolume(float lvec[3], float vvec[3], const float inp)
 	normalize_v3(lvec);
 	normalize_v3(vvec);             /* is this the correct vector ? */
 
-	cross_v3_v3v3(temp, vvec, lvec);      /* equation for a plane through vvec en lvec */
-	cross_v3_v3v3(plane, lvec, temp);     /* a plane perpendicular to this, parrallel with lvec */
+	cross_v3_v3v3(temp, vvec, lvec);      /* equation for a plane through vvec and lvec */
+	cross_v3_v3v3(plane, lvec, temp);     /* a plane perpendicular to this, parallel with lvec */
 
 	/* vectors are exactly aligned, use the X axis, this is arbitrary */
 	if (normalize_v3(plane) == 0.0f)
@@ -1162,7 +1160,7 @@ static void drawlamp(View3D *v3d, RegionView3D *rv3d, Base *base,
 
 	unsigned char curcol[4];
 	unsigned char col[4];
-	/* cone can't be drawn for duplicated lamps, because duplilist would be freed to */
+	/* cone can't be drawn for duplicated lamps, because duplilist would be freed */
 	/* the moment of view3d_draw_transp() call */
 	const bool is_view = (rv3d->persp == RV3D_CAMOB && v3d->camera == base->object);
 	const bool drawcone = ((dt > OB_WIRE) &&
@@ -1311,7 +1309,7 @@ static void drawlamp(View3D *v3d, RegionView3D *rv3d, Base *base,
 		x *= y;
 
 		/* draw the circle/square at the end of the cone */
-		glTranslatef(0.0, 0.0,  x);
+		glTranslatef(0.0, 0.0, x);
 		if (la->mode & LA_SQUARE) {
 			float tvec[3];
 			float z_abs = fabsf(z);
@@ -1500,10 +1498,10 @@ static void draw_limit_line(float sta, float end, const short dflag, unsigned in
 static void draw_focus_cross(float dist, float size)
 {
 	glBegin(GL_LINES);
-	glVertex3f(-size, 0.f, -dist);
-	glVertex3f(size, 0.f, -dist);
-	glVertex3f(0.f, -size, -dist);
-	glVertex3f(0.f, size, -dist);
+	glVertex3f(-size, 0.0f, -dist);
+	glVertex3f(size, 0.0f, -dist);
+	glVertex3f(0.0f, -size, -dist);
+	glVertex3f(0.0f, size, -dist);
 	glEnd();
 }
 
@@ -1556,8 +1554,7 @@ static void draw_viewport_object_reconstruction(Scene *scene, Base *base, View3D
 	BKE_tracking_get_camera_object_matrix(scene, base->object, mat);
 
 	/* we're compensating camera size for bundles size,
-	 * to make it so bundles are always displayed with the same size
-	 */
+	 * to make it so bundles are always displayed with the same size */
 	copy_v3_v3(camera_size, base->object->size);
 	if ((tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0)
 		mul_v3_fl(camera_size, tracking_object->scale);
@@ -1991,9 +1988,9 @@ static void ensure_curve_cache(Scene *scene, Object *object)
 	 * here, we also need to check whether display list is
 	 * empty or not.
 	 *
-	 * The trick below tries to optimie calls to displist
+	 * The trick below tries to optimize calls to displist
 	 * creation for cases curve is empty. Meaning, if the curve
-	 * is empty (without splies) bevel list would also be empty.
+	 * is empty (without splines) bevel list would also be empty.
 	 * And the thing is, render thread always leaves bevel list
 	 * in a proper state. So if bevel list is here and display
 	 * list is not we need to make display list.
@@ -2271,8 +2268,7 @@ static void draw_dm_verts__mapFunc(void *userData, int index, const float co[3],
 	BMVert *eve = BM_vert_at_index(data->bm, index);
 
 	if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->sel) {
-		/* skin nodes: draw a red circle around the root
-		 * node(s) */
+		/* skin nodes: draw a red circle around the root node(s) */
 		if (data->cd_vskin_offset != -1) {
 			const MVertSkin *vs = BM_ELEM_CD_GET_VOID_P(eve, data->cd_vskin_offset);
 			if (vs->flag & MVERT_SKIN_ROOT) {
@@ -2355,7 +2351,7 @@ static DMDrawOption draw_dm_edges_sel__setDrawOptions(void *userData, int index)
 			else {
 				col = data->baseCol;
 			}
-			/* no alpha, this is used so a transparent color can disable drawing unselected edges in editmode  */
+			/* no alpha, this is used so a transparent color can disable drawing unselected edges in editmode */
 			if (col[3] == 0)
 				return DM_DRAW_OPTION_SKIP;
 			
@@ -3045,7 +3041,7 @@ static void draw_em_measure_stats(ARegion *ar, View3D *v3d, Object *ob, BMEditMe
 		}
 
 		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			/* draw selected edges, or edges next to selected verts while draging */
+			/* draw selected edges, or edges next to selected verts while dragging */
 			if (BM_elem_flag_test(eed, BM_ELEM_SELECT) ||
 			    (do_moving && (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
 			                   BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))))
@@ -3107,12 +3103,12 @@ static void draw_em_measure_stats(ARegion *ar, View3D *v3d, Object *ob, BMEditMe
 		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
 			BMLoop *l_a, *l_b;
 			if (BM_edge_loop_pair(eed, &l_a, &l_b)) {
-				/* draw selected edges, or edges next to selected verts while draging */
+				/* draw selected edges, or edges next to selected verts while dragging */
 				if (BM_elem_flag_test(eed, BM_ELEM_SELECT) ||
 				    (do_moving && (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) ||
 				                   BM_elem_flag_test(eed->v2, BM_ELEM_SELECT) ||
-				                   /* special case, this is useful to show when vertes connected to this edge via a
-				                    * face are being transformed */
+				                   /* special case, this is useful to show when verts connected to
+				                    * this edge via a face are being transformed */
 				                   BM_elem_flag_test(l_a->next->next->v, BM_ELEM_SELECT) ||
 				                   BM_elem_flag_test(l_a->prev->v, BM_ELEM_SELECT)       ||
 				                   BM_elem_flag_test(l_b->next->next->v, BM_ELEM_SELECT) ||
@@ -3418,7 +3414,7 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d,
 	
 	if (em->bm->selected.last) {
 		BMEditSelection *ese = em->bm->selected.last;
-		/* face is handeled above */
+		/* face is handled above */
 #if 0
 		if (ese->type == BM_FACE) {
 			efa_act = (BMFace *)ese->data;
@@ -3533,11 +3529,14 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d,
 	}
 	else if (efa_act) {
 		/* even if draw faces is off it would be nice to draw the stipple face
-		 * Make all other faces zero alpha except for the active
-		 * */
-		/* col4 is only used by WITH_FREESTYLE, but keeping it here spares some #ifdef's... */
-		unsigned char col1[4], col2[4], col3[4], col4[4];
-		col1[3] = col2[3] = col4[3] = 0; /* don't draw */
+		 * Make all other faces zero alpha except for the active */
+		unsigned char col1[4], col2[4], col3[4];
+#ifdef WITH_FREESTYLE
+		unsigned char col4[4];
+		col4[3] = 0; /* don't draw */
+#endif
+		col1[3] = col2[3] = 0; /* don't draw */
+
 		UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
 
 		glEnable(GL_BLEND);
@@ -3551,7 +3550,6 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d,
 
 		glDisable(GL_BLEND);
 		glDepthMask(1);  /* restore write in zbuffer */
-
 	}
 
 	/* here starts all fancy draw-extra over */
@@ -3734,7 +3732,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 		glPointSize(1.0);
 	}
 	else if (dt == OB_WIRE || totface == 0) {
-		draw_wire = OBDRAW_WIRE_ON; /* draw wire only, no depth buffer stuff  */
+		draw_wire = OBDRAW_WIRE_ON; /* draw wire only, no depth buffer stuff */
 	}
 	else if (((is_obact && ob->mode & OB_MODE_TEXTURE_PAINT)) ||
 	         check_object_draw_texture(scene, v3d, dt))
@@ -3776,8 +3774,10 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 			else
 				dm->drawFacesGLSL(dm, GPU_enable_material);
 
-//			if (BKE_bproperty_object_get(ob, "Text"))
-// XXX				draw_mesh_text(ob, 1);
+#if 0 /* XXX */
+			if (BKE_bproperty_object_get(ob, "Text"))
+				draw_mesh_text(ob, 1);
+#endif
 			GPU_disable_material();
 
 			glFrontFace(GL_CCW);
@@ -3895,7 +3895,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	}
 
 	if ((draw_wire != OBDRAW_WIRE_OFF) &&  /* draw extra wire */
-	    /* when overriding with render only, don't bother  */
+	    /* when overriding with render only, don't bother */
 	    (((v3d->flag2 & V3D_RENDER_OVERRIDE) && v3d->drawtype >= OB_SOLID) == 0))
 	{
 		/* When using wireframe object draw in particle edit mode
@@ -3949,7 +3949,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	dm->release(dm);
 }
 
-/* returns 1 if nothing was drawn, for detecting to draw an object center */
+/* returns true if nothing was drawn, for detecting to draw an object center */
 static bool draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, Base *base,
                              const char dt, const unsigned char ob_wire_col[4], const short dflag)
 {
@@ -4329,7 +4329,7 @@ static bool drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 
 /**
  * Only called by #drawDispList
- * \return 1 when nothing was drawn
+ * \return true when nothing was drawn
  */
 static bool drawDispList_nobackface(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
                                     const char dt, const short dflag, const unsigned char ob_wire_col[4])
@@ -4601,7 +4601,7 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
 			copy_v3_v3(pdd->vd, vec2); pdd->vd += 3;
 
 			vec[2] = 2.0f * pixsize;
-			vec[0] = vec[1] = 0.0;
+			vec[0] = vec[1] = 0.0f;
 			mul_qt_v3(state->rot, vec);
 			if (draw_as == PART_DRAW_AXIS) {
 				copy_v3_v3(vec2, state->co);
@@ -4684,7 +4684,7 @@ static void draw_particle_data(ParticleSystem *psys, RegionView3D *rv3d,
 	if (psys->parent)
 		mul_m4_v3(psys->parent->obmat, state->co);
 
-	/* create actiual particle data */
+	/* create actual particle data */
 	if (draw_as == PART_DRAW_BB) {
 		bb->offset[0] = part->bb_offset[0];
 		bb->offset[1] = part->bb_offset[1];
@@ -4709,16 +4709,17 @@ static void draw_particle_data(ParticleSystem *psys, RegionView3D *rv3d,
 
 	draw_particle(state, draw_as, part->draw, pixsize, imat, part->draw_line, bb, pdd);
 }
-/* unified drawing of all new particle systems draw types except dupli ob & group	*/
-/* mostly tries to use vertex arrays for speed										*/
-
-/* 1. check that everything is ok & updated */
-/* 2. start initializing things				*/
-/* 3. initialize according to draw type		*/
-/* 4. allocate drawing data arrays			*/
-/* 5. start filling the arrays				*/
-/* 6. draw the arrays						*/
-/* 7. clean up								*/
+/* unified drawing of all new particle systems draw types except dupli ob & group
+ * mostly tries to use vertex arrays for speed
+ *
+ * 1. check that everything is ok & updated
+ * 2. start initializing things
+ * 3. initialize according to draw type
+ * 4. allocate drawing data arrays
+ * 5. start filling the arrays
+ * 6. draw the arrays
+ * 7. clean up
+ */
 static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv3d,
                                      Base *base, ParticleSystem *psys,
                                      const char ob_dt, const short dflag)
@@ -4914,7 +4915,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 		int create_ndata = 0;
 
 		if (!pdd)
-			pdd = psys->pdd = MEM_callocN(sizeof(ParticleDrawData), "ParticlDrawData");
+			pdd = psys->pdd = MEM_callocN(sizeof(ParticleDrawData), "ParticleDrawData");
 
 		if (part->draw_as == PART_DRAW_REND && part->trail_count > 1) {
 			tot_vec_size *= part->trail_count;
@@ -5076,8 +5077,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 				}
 
 				if (drawn) {
-					/* additional things to draw for each particle	*/
-					/* (velocity, size and number)					*/
+					/* additional things to draw for each particle
+					 * (velocity, size and number) */
 					if ((part->draw & PART_DRAW_VEL) && pdd && pdd->vedata) {
 						copy_v3_v3(pdd->ved, state.co);
 						pdd->ved += 3;
@@ -5118,8 +5119,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 						}
 
 						if (numstr[0]) {
-							/* in path drawing state.co is the end point */
-							/* use worldspace beause object matrix is already applied */
+							/* in path drawing state.co is the end point
+							 * use worldspace because object matrix is already applied */
 							mul_v3_m4v3(vec_txt, ob->imat, state.co);
 							view3d_cached_text_draw_add(vec_txt, numstr, numstr_len,
 							                            10, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, tcol);
@@ -5200,11 +5201,13 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 						HairKey *hkey = pa->hair;
 						
 						glVertexPointer(3, GL_FLOAT, sizeof(HairKey), hkey->world_co);
-						
-						// XXX use proper theme color here
-//						UI_ThemeColor(TH_NORMAL);
+
+#if 0 /* XXX use proper theme color here */
+						UI_ThemeColor(TH_NORMAL);
+#else
 						glColor3f(0.58f, 0.67f, 1.0f);
-						
+#endif
+
 						glDrawArrays(GL_LINE_STRIP, 0, pa->totkey);
 					}
 				}
@@ -5353,7 +5356,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 			for (a = 0, pa = psys->particles; a < totpart; a++, pa++) {
 				float vec_txt[3];
 				numstr_len = BLI_snprintf(numstr, sizeof(numstr), "%i", a);
-				/* use worldspace beause object matrix is already applied */
+				/* use worldspace because object matrix is already applied */
 				mul_v3_m4v3(vec_txt, ob->imat, cache[a]->co);
 				view3d_cached_text_draw_add(vec_txt, numstr, numstr_len,
 				                            10, V3D_CACHE_TEXT_WORLDSPACE | V3D_CACHE_TEXT_ASCII, tcol);
@@ -5637,7 +5640,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 	glShadeModel(GL_FLAT);
 	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
 	glLineWidth(1.0f);
-	glPointSize(1.0);
+	glPointSize(1.0f);
 }
 //static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float tw,float th)
 static void ob_draw_RE_motion(float com[3], float rotscale[3][3], float itw, float ith, float drw_size)
@@ -6043,7 +6046,7 @@ static void draw_editnurb_splines(Object *ob, Nurb *nurb, const bool sel)
 	Nurb *nu;
 	BPoint *bp, *bp1;
 	int a, b, ofs, index;
-	Curve *cu = (Curve *)ob->data;
+	Curve *cu = ob->data;
 
 	index = 0;
 	nu = nurb;
@@ -6403,7 +6406,7 @@ static void draw_empty_sphere(float size)
 	static GLuint displist = 0;
 	
 	if (displist == 0) {
-		GLUquadricObj   *qobj;
+		GLUquadricObj *qobj;
 		
 		displist = glGenLists(1);
 		glNewList(displist, GL_COMPILE);
@@ -6439,7 +6442,6 @@ static void draw_empty_cone(float size)
 	GLUquadricObj *qobj = gluNewQuadric();
 	gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
 	
-	
 	glPushMatrix();
 	
 	radius = size;
@@ -6456,7 +6458,7 @@ static void draw_empty_cone(float size)
 static void drawspiral(const float cent[3], float rad, float tmat[4][4], int start)
 {
 	float vec[3], vx[3], vy[3];
-	const float tot_inv = (1.0f / (float)CIRCLE_RESOL);
+	const float tot_inv = 1.0f / (float)CIRCLE_RESOL;
 	int a;
 	bool inverse = false;
 	float x, y, fac;
@@ -6520,8 +6522,7 @@ static void drawspiral(const float cent[3], float rad, float tmat[4][4], int sta
 }
 
 /* draws a circle on x-z plane given the scaling of the circle, assuming that
- * all required matrices have been set (used for drawing empties)
- */
+ * all required matrices have been set (used for drawing empties) */
 static void drawcircle_size(float size)
 {
 	float x, y;
@@ -6529,7 +6530,7 @@ static void drawcircle_size(float size)
 
 	glBegin(GL_LINE_LOOP);
 
-	/* coordinates are: cos(degrees * 11.25) = x, sin(degrees*11.25) = y, 0.0f = z */
+	/* coordinates are: cos(degrees * 11.25) = x, sin(degrees * 11.25) = y, 0.0f = z */
 	for (degrees = 0; degrees < CIRCLE_RESOL; degrees++) {
 		x = cosval[degrees];
 		y = sinval[degrees];
@@ -6681,8 +6682,10 @@ static void draw_forcefield(Object *ob, RegionView3D *rv3d,
 	
 	/* calculus here, is reused in PFIELD_FORCE */
 	invert_m4_m4(imat, rv3d->viewmatob);
-//	normalize_v3(imat[0]);  /* we don't do this because field doesnt scale either... apart from wind! */
-//	normalize_v3(imat[1]);
+#if 0
+	normalize_v3(imat[0]);  /* we don't do this because field doesnt scale either... apart from wind! */
+	normalize_v3(imat[1]);
+#endif
 	
 	if (pd->forcefield == PFIELD_WIND) {
 		float force_val;
@@ -7185,7 +7188,7 @@ static void draw_object_wire_color(Scene *scene, Base *base, unsigned char r_ob_
 		else {
 			if (ob->flag & OB_FROMGROUP) {
 				if (base->flag & (SELECT + BA_WAS_SEL)) {
-					/* uses darker active color for non-active + selected*/
+					/* uses darker active color for non-active + selected */
 					theme_id = TH_GROUP_ACTIVE;
 
 					if (scene->basact != base) {
@@ -7445,10 +7448,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 	if (dt >= OB_BOUNDBOX) {
 		dtx = ob->dtx;
 		if (ob->mode & OB_MODE_EDIT) {
-			// the only 2 extra drawtypes alowed in editmode
+			/* the only 2 extra drawtypes alowed in editmode */
 			dtx = dtx & (OB_DRAWWIRE | OB_TEXSPACE);
 		}
-
 	}
 
 	if (!particle_skip_object) {
@@ -7506,9 +7508,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				}
 				else if (ED_view3d_boundbox_clip(rv3d, ob->bb)) {
 					empty_object = drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
-
-//XXX old animsys				if (cu->path)
-//                                  curve_draw_speed(scene, ob);
+#if 0 /* XXX old animsys */
+				if (cu->path)
+					curve_draw_speed(scene, ob);
+#endif
 				}
 				break;
 			case OB_MBALL:
@@ -7676,7 +7679,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 	if ((md = modifiers_findByType(ob, eModifierType_Smoke)) && (modifier_isEnabled(scene, md, eModifierMode_Realtime))) {
 		SmokeModifierData *smd = (SmokeModifierData *)md;
 
-		// draw collision objects
+		/* draw collision objects */
 		if ((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll) {
 #if 0
 			SmokeCollSettings *scs = smd->coll;
@@ -7705,7 +7708,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				glDisable(GL_BLEND);
 				glDepthMask(GL_TRUE);
 				if (col) cpack(col);
-				
 			}
 #endif
 		}
@@ -7727,8 +7729,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				BKE_boundbox_init_from_minmax(&bb, p0, p1);
 				draw_box(bb.vec);
 
-				/* draw base resolution bounds */
 #if 0
+				/* draw base resolution bounds */
 				BKE_boundbox_init_from_minmax(&bb, sds->p0, sds->p1);
 				draw_box(bb.vec);
 #endif
@@ -7737,15 +7739,15 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 			/* don't show smoke before simulation starts, this could be made an option in the future */
 			if (smd->domain->fluid && CFRA >= smd->domain->point_cache[0]->startframe) {
 
-				// get view vector
+				/* get view vector */
 				copy_v3_v3(viewnormal, rv3d->viewinv[2]);
 				invert_m4_m4(ob->imat, ob->obmat);
 				mul_mat3_m4_v3(ob->imat, viewnormal);
 				normalize_v3(viewnormal);
 
 				/* set dynamic boundaries to draw the volume
-				 * also scale cube to global space to equalize volume slicing on all axises
-				 *  (its scaled back before drawing) */
+				 * also scale cube to global space to equalize volume slicing on all axes
+				 *  (it's scaled back before drawing) */
 				p0[0] = (sds->p0[0] + sds->cell_size[0] * sds->res_min[0] + sds->obj_shift_f[0]) * fabsf(ob->size[0]);
 				p0[1] = (sds->p0[1] + sds->cell_size[1] * sds->res_min[1] + sds->obj_shift_f[1]) * fabsf(ob->size[1]);
 				p0[2] = (sds->p0[2] + sds->cell_size[2] * sds->res_min[2] + sds->obj_shift_f[2]) * fabsf(ob->size[2]);
@@ -7945,7 +7947,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				if (ELEM(curcon->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_OBJECTSOLVER)) {
 					/* special case for object solver and follow track constraints because they don't fill
 					 * constraint targets properly (design limitation -- scene is needed for their target
-					 * but it can't be accessed from get_targets callvack) */
+					 * but it can't be accessed from get_targets callback) */
 
 					Object *camob = NULL;
 
@@ -8202,7 +8204,7 @@ static void bbs_mesh_solid_verts(Scene *scene, Object *ob)
 static void bbs_mesh_solid_faces(Scene *scene, Object *ob)
 {
 	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
-	Mesh *me = (Mesh *)ob->data;
+	Mesh *me = ob->data;
 	
 	glColor3ub(0, 0, 0);