[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18614] branches/etch-a-ton/source/blender /src: misc bug fixes and display adjustments

[Martin Poirier]

Revision: 18614
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18614
Author:   theeth
Date:     2009-01-21 23:20:16 +0100 (Wed, 21 Jan 2009)

Log Message:
-----------
misc bug fixes and display adjustments

Modified Paths:
--------------
    branches/etch-a-ton/source/blender/src/editarmature_retarget.c
    branches/etch-a-ton/source/blender/src/editarmature_sketch.c

Modified: branches/etch-a-ton/source/blender/src/editarmature_retarget.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_retarget.c	2009-01-21 21:17:32 UTC (rev 18613)
+++ branches/etch-a-ton/source/blender/src/editarmature_retarget.c	2009-01-21 22:20:16 UTC (rev 18614)
@@ -816,16 +816,20 @@
 							/* SET bone link to bone corresponding to pchan */
 							EditBone *link = BLI_ghash_lookup(rg->bones_map, pchan->name);
 							
-							/* for pole targets, link to parent bone instead, if possible */
-							if (con->type == CONSTRAINT_TYPE_KINEMATIC && target_index == 1)
+							/* Making sure bone is in this armature */
+							if (link != NULL)
 							{
-								if (link->parent && BLI_ghash_haskey(rg->bones_map, link->parent->name))
+								/* for pole targets, link to parent bone instead, if possible */
+								if (con->type == CONSTRAINT_TYPE_KINEMATIC && target_index == 1)
 								{
-									link = link->parent;
+									if (link->parent && BLI_ghash_haskey(rg->bones_map, link->parent->name))
+									{
+										link = link->parent;
+									}
 								}
+								
+								found = RIG_parentControl(ctrl, link);
 							}
-							
-							found = RIG_parentControl(ctrl, link);
 						}
 					}
 					

Modified: branches/etch-a-ton/source/blender/src/editarmature_sketch.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_sketch.c	2009-01-21 21:17:32 UTC (rev 18613)
+++ branches/etch-a-ton/source/blender/src/editarmature_sketch.c	2009-01-21 22:20:16 UTC (rev 18614)
@@ -1258,7 +1258,8 @@
 	iter->head(iter);
 	VECCOPY(head, iter->p);
 	
-	glColor3f(0, 1, 1);
+	glColor3f(0, 1, 0);
+	glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE) * 2);
 	glBegin(GL_POINTS);
 	
 	index = next_subdividion(iter, bone_start, end, head, tail);
@@ -1273,6 +1274,7 @@
 	}
 	
 	glEnd();
+	glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE));
 }
 
 void sk_drawStrokeSubdivision(SK_Stroke *stk)