[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56143] trunk/blender/source/blender: code cleanup: removed unneeded null check in object drawing, some warnings , style.

[Campbell Barton]

Revision: 56143
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56143
Author:   campbellbarton
Date:     2013-04-18 15:09:30 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
code cleanup: removed unneeded null check in object drawing, some warnings, style.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c
    trunk/blender/source/blender/editors/space_node/node_templates.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c	2013-04-18 14:55:04 UTC (rev 56142)
+++ trunk/blender/source/blender/blenkernel/intern/editmesh_bvh.c	2013-04-18 15:09:30 UTC (rev 56143)
@@ -138,7 +138,7 @@
 	BLI_bvhtree_free(bmtree->tree);
 	
 	if (bmtree->cos_cage && bmtree->cos_cage_free) {
-		MEM_freeN(bmtree->cos_cage);
+		MEM_freeN((void *)bmtree->cos_cage);
 	}
 	
 	MEM_freeN(bmtree);

Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-04-18 14:55:04 UTC (rev 56142)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-04-18 15:09:30 UTC (rev 56143)
@@ -2939,7 +2939,7 @@
 	ED_region_tag_redraw(kcd->ar);
 
 	if (kcd->cagecos)
-		MEM_freeN(kcd->cagecos);
+		MEM_freeN((void *)kcd->cagecos);
 
 	if (kcd->linehits)
 		MEM_freeN(kcd->linehits);

Modified: trunk/blender/source/blender/editors/space_node/node_templates.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_templates.c	2013-04-18 14:55:04 UTC (rev 56142)
+++ trunk/blender/source/blender/editors/space_node/node_templates.c	2013-04-18 15:09:30 UTC (rev 56143)
@@ -209,8 +209,7 @@
 		if (!(node_from->inputs.first == NULL && !(node_from->typeinfo->flag & NODE_OPTIONS)))
 			node_from = NULL;
 
-	if (node_prev && node_prev->type == type && node_link_item_compare(node_prev, item))
-	{
+	if (node_prev && node_prev->type == type && node_link_item_compare(node_prev, item)) {
 		/* keep the previous node if it's the same type */
 		node_from = node_prev;
 	}
@@ -303,7 +302,7 @@
 		int i;
 		
 		for (ngroup = arg->bmain->nodetree.first; ngroup; ngroup = ngroup->id.next) {
-			ListBase *lb = (in_out==SOCK_IN ? &ngroup->inputs : &ngroup->outputs);
+			ListBase *lb = ((in_out == SOCK_IN) ? &ngroup->inputs : &ngroup->outputs);
 			totitems += BLI_countlist(lb);
 		}
 		

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-04-18 14:55:04 UTC (rev 56142)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-04-18 15:09:30 UTC (rev 56143)
@@ -7058,11 +7058,12 @@
 	/* not for sets, duplicators or picking */
 	if (dflag == 0 && (v3d->flag & V3D_HIDE_HELPLINES) == 0 && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		ListBase *list;
-		RigidBodyCon *rbc = ob ? ob->rigidbody_constraint : NULL;
+		RigidBodyCon *rbc = ob->rigidbody_constraint;
 		
 		/* draw hook center and offset line */
-		if (ob != scene->obedit) draw_hooks(ob);
-		
+		if (ob != scene->obedit)
+			draw_hooks(ob);
+
 		/* help lines and so */
 		if (ob != scene->obedit && ob->parent && (ob->parent->lay & v3d->lay)) {
 			setlinestyle(3);