[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23856] trunk/blender/source/blender: made texflag a short everywhere (only stores one flag)
Campbell Barton
ideasman42 at gmail.com
Thu Oct 15 11:00:40 CEST 2009
Revision: 23856
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23856
Author: campbellbarton
Date: 2009-10-15 11:00:40 +0200 (Thu, 15 Oct 2009)
Log Message:
-----------
made texflag a short everywhere (only stores one flag)
fix for crash with separate (missing NULL check)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_object.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesdna/DNA_meta_types.h
Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h 2009-10-15 08:39:47 UTC (rev 23855)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h 2009-10-15 09:00:40 UTC (rev 23856)
@@ -114,7 +114,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2009-10-15 08:39:47 UTC (rev 23855)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2009-10-15 09:00:40 UTC (rev 23856)
@@ -1102,7 +1102,7 @@
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 @@
}
}
-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;
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2009-10-15 08:39:47 UTC (rev 23855)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2009-10-15 09:00:40 UTC (rev 23856)
@@ -1258,7 +1258,7 @@
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;
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2009-10-15 08:39:47 UTC (rev 23855)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2009-10-15 09:00:40 UTC (rev 23856)
@@ -292,7 +292,7 @@
TransData *td;
Object *ob;
ID *id;
- int *texflag;
+ short *texflag;
ob = OBACT;
Modified: trunk/blender/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_curve_types.h 2009-10-15 08:39:47 UTC (rev 23855)
+++ trunk/blender/source/blender/makesdna/DNA_curve_types.h 2009-10-15 09:00:40 UTC (rev 23856)
@@ -174,7 +174,7 @@
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;
Modified: trunk/blender/source/blender/makesdna/DNA_meta_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meta_types.h 2009-10-15 08:39:47 UTC (rev 23855)
+++ trunk/blender/source/blender/makesdna/DNA_meta_types.h 2009-10-15 09:00:40 UTC (rev 23856)
@@ -77,7 +77,7 @@
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];
More information about the Bf-blender-cvs
mailing list