More constraints bugfixes:

* Fixed crash that occurs when using an unknown constraint type or a Null constraint - missing NULL check
* ClampTo constraint now draws ok again
* Null constraints now get drawn in the stack again

1 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/src/editconstraint.c b/source/blender/src/editconstraint.c
index 7059c637fc1..0360c4add18 100644
--- a/source/blender/src/editconstraint.c
+++ b/source/blender/src/editconstraint.c
@@ -223,7 +223,7 @@ bConstraint *add_new_constraint(short type)
 	con->type = type;
 	con->flag |= CONSTRAINT_EXPAND;
 	con->enforce = 1.0F;
-	strcpy (con->name, "Const");
+	strcpy(con->name, "Const");
 	
 	/* Load the data for it */
 	cti = constraint_get_typeinfo(con);
@@ -248,7 +248,7 @@ void add_constraint_to_object(bConstraint *con, Object *ob)
 		BLI_addtail(list, con);
 		
 		con->flag |= CONSTRAINT_ACTIVE;
-		for(con= con->prev; con; con= con->prev)
+		for (con= con->prev; con; con= con->prev)
 			con->flag &= ~CONSTRAINT_ACTIVE;
 	}
 }
@@ -256,7 +256,7 @@ void add_constraint_to_object(bConstraint *con, Object *ob)
 /* checks validity of object pointers, and NULLs,
  * if Bone doesnt exist it sets the CONSTRAINT_DISABLE flag 
  */
-static void test_constraints (Object *owner, const char* substring)
+static void test_constraints (Object *owner, const char substring[])
 {
 	
 	bConstraint *curcon;
@@ -328,7 +328,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bActionConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -346,7 +346,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bLocateLikeConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -364,7 +364,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bMinMaxConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -382,7 +382,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bRotateLikeConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -400,7 +400,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bSizeLikeConstraint *data = curcon->data;
 				
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -417,7 +417,7 @@ static void test_constraints (Object *owner, const char* substring)
 				case CONSTRAINT_TYPE_KINEMATIC:
 				{
 					bKinematicConstraint *data = curcon->data;
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -446,11 +446,11 @@ static void test_constraints (Object *owner, const char* substring)
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
-					if (data->reserved2==data->reserved1){
+					if (data->reserved2==data->reserved1) {
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
-					if (data->reserved2+3==data->reserved1){
+					if (data->reserved2+3==data->reserved1) {
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
@@ -460,7 +460,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bLockTrackConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -473,11 +473,11 @@ static void test_constraints (Object *owner, const char* substring)
 						break;
 					}
 
-					if (data->lockflag==data->trackflag){
+					if (data->lockflag==data->trackflag) {
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
-					if (data->lockflag+3==data->trackflag){
+					if (data->lockflag+3==data->trackflag) {
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
@@ -487,7 +487,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bStretchToConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -505,21 +505,21 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bFollowPathConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
-					if (data->tar->type != OB_CURVE){
+					if (data->tar->type != OB_CURVE) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
-					if (data->upflag==data->trackflag){
+					if (data->upflag==data->trackflag) {
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
-					if (data->upflag+3==data->trackflag){
+					if (data->upflag+3==data->trackflag) {
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
@@ -529,13 +529,13 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bClampToConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
 					}
 					
-					if (data->tar->type != OB_CURVE){
+					if (data->tar->type != OB_CURVE) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;
@@ -552,7 +552,7 @@ static void test_constraints (Object *owner, const char* substring)
 				{
 					bTransformConstraint *data = curcon->data;
 					
-					if (!exist_object(data->tar)){
+					if (!exist_object(data->tar)) {
 						data->tar = NULL;
 						curcon->flag |= CONSTRAINT_DISABLE;
 						break;