made texflag a short everywhere (only stores one flag)

fix for crash with separate (missing NULL check)

6 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 1cb6efeb838..aeb33cd3628 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -114,7 +114,7 @@ int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3
 void object_handle_update(struct Scene *scene, struct Object *ob);
 
 float give_timeoffset(struct Object *ob);
-int give_obdata_texspace(struct Object *ob, int **texflag, float **loc, float **size, float **rot);
+int give_obdata_texspace(struct Object *ob, short **texflag, float **loc, float **size, float **rot);
 
 int object_insert_ptcache(struct Object *ob);
 // void object_delete_ptcache(struct Object *ob, int index);
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8494fdae954..eb5beb734a1 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1102,7 +1102,7 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys)
 			pa->hair = MEM_dupallocN(pa->hair);
 	}
 
-	if(psysn->particles->keys || psysn->particles->boid) {
+	if(psysn->particles && (psysn->particles->keys || psysn->particles->boid)) {
 		ParticleKey *key = psysn->particles->keys;
 		BoidParticle *boid = psysn->particles->boid;
 
@@ -2475,7 +2475,7 @@ float give_timeoffset(Object *ob) {
 	}
 }
 
-int give_obdata_texspace(Object *ob, int **texflag, float **loc, float **size, float **rot) {
+int give_obdata_texspace(Object *ob, short **texflag, float **loc, float **size, float **rot) {
 	
 	if (ob->data==NULL)
 		return 0;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index abd6847c6db..d302e1eeec8 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1258,7 +1258,7 @@ static void copymenu_modifiers(Scene *scene, View3D *v3d, Object *ob)
 static void copy_texture_space(Object *to, Object *ob)
 {
 	float *poin1= NULL, *poin2= NULL;
-	int texflag= 0;
+	short texflag= 0;
 	
 	if(ob->type==OB_MESH) {
 		texflag= ((Mesh *)ob->data)->texflag;
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 16d07894682..317457ee33f 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -292,7 +292,7 @@ static void createTransTexspace(bContext *C, TransInfo *t)
 	TransData *td;
 	Object *ob;
 	ID *id;
-	int *texflag;
+	short *texflag;
 
 	ob = OBACT;
 
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 6cfeb646cf2..f988511b146 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -174,7 +174,7 @@ typedef struct Curve {
 	float size[3];
 	float rot[3];
 
-	int texflag; /* keep an int because of give_obdata_texspace() */
+	short texflag, pad1; /* keep a short because of give_obdata_texspace() */
 
 	short drawflag, twist_mode,  pad[2];
 	float twist_smooth, pad2;
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h
index 8b61405b851..0e746eb0f4d 100644
--- a/source/blender/makesdna/DNA_meta_types.h
+++ b/source/blender/makesdna/DNA_meta_types.h
@@ -77,7 +77,7 @@ typedef struct MetaBall {
 
 	char flag, flag2;			/* flag is enum for updates, flag2 is bitflags for settings */
 	short totcol;
-	int texflag; /* used to store MB_AUTOSPACE */
+	short texflag, pad; /* used to store MB_AUTOSPACE */
 	
 	/* texture space, copied as one block in editobject.c */
 	float loc[3];