diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-10-22 10:28:39 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-10-22 10:28:39 +0400 |
commit | cfd9d390fcbe92b257d9784f6d12e88e5a66adc9 (patch) | |
tree | e0fbbea03f25b1f5e832280ea9c8fb0c92623ebd | |
parent | 2cc41ad890326679b47c9931708d3afc3dae300f (diff) |
Several fixes:
* DNA_action_types.h - fixes for typos that broke compiling (own error)
* transform.c - fix for implicit definition of a function (missing header)
* outliner.c - commented out a few unused vars (as a result of constraints refactor)
* editsima.c - fixed uninitialised var warning
* drawview.c - bugfix #7598 load without ui crashes if there is no camera. Patch provided by Daniel Genrich (genscher)
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 6 | ||||
-rw-r--r-- | source/blender/src/drawview.c | 4 | ||||
-rw-r--r-- | source/blender/src/editsima.c | 2 | ||||
-rw-r--r-- | source/blender/src/outliner.c | 8 | ||||
-rw-r--r-- | source/blender/src/transform.c | 1 |
5 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 479bb749196..3c5ef7c94e6 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -162,7 +162,7 @@ typedef enum SACTION_FLAG { /* SpaceAction AutoSnap Settings (also used by SpaceNLA) */ typedef enum SACTSNAP_MODES { /* no auto-snap */ - SACTSNAP_OFF = 0 + SACTSNAP_OFF = 0, /* snap to 1.0 frame/second intervals */ SACTSNAP_STEP, /* snap to actual frames/seconds (nla-action time) */ @@ -199,7 +199,7 @@ enum { }; /* PoseChannel constflag (constraint detection) */ -typedef PCHAN_CONSTFLAG { +typedef enum PCHAN_CONSTFLAG { PCHAN_HAS_IK = (1<<0), PCHAN_HAS_CONST = (1<<1), /* only used for drawing Posemode, not stored in channel */ @@ -210,7 +210,7 @@ typedef PCHAN_CONSTFLAG { } PCHAN_CONSTFLAG; /* PoseChannel->ikflag */ -typedef PCHAN_IKFLAG { +typedef enum PCHAN_IKFLAG { BONE_IK_NO_XDOF = (1<<0), BONE_IK_NO_YDOF = (1<<1), BONE_IK_NO_ZDOF = (1<<2), diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 6752988d6f1..e437ad86cda 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1509,8 +1509,8 @@ static void draw_viewport_name(ScrArea *sa) name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Ortho" : "Top Ortho"; break; default: - if(G.vd->persp==V3D_PERSP_USE_THE_CAMERA) { - if (G.vd->camera->type == OB_CAMERA) { + if (G.vd->persp==V3D_PERSP_USE_THE_CAMERA) { + if ((G.vd->camera) && (G.vd->camera->type == OB_CAMERA)) { Camera *cam; cam = G.vd->camera->data; name = (cam->type != CAM_ORTHO) ? "Camera Persp" : "Camera Ortho"; diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 1b713609174..18191c970df 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -1634,7 +1634,7 @@ void uvface_setsel__internal(short select) } else if ((G.sima->flag & SI_SYNC_UVSEL)==0 && G.sima->sticky == SI_STICKY_LOC) { EditFace *efa_vlist; MTFace *tf_vlist; - UvMapVert *vlist, *start_vlist, *vlist_iter; + UvMapVert *vlist, *start_vlist=NULL, *vlist_iter; struct UvVertMap *vmap; float limit[2]; int efa_index; diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 0ed50c75ad4..aa5fd0d409b 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -591,11 +591,11 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i pchan->prev= (bPoseChannel *)ten; if(pchan->constraints.first) { - Object *target; + //Object *target; bConstraint *con; TreeElement *ten1; TreeElement *tenla1= outliner_add_element(soops, &ten->subtree, ob, ten, TSE_CONSTRAINT_BASE, 0); - char *str; + //char *str; tenla1->name= "Constraints"; for(con= pchan->constraints.first; con; con= con->next, const_index++) { @@ -644,12 +644,12 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i outliner_add_element(soops, &te->subtree, ob->mat[a], te, 0, a); if(ob->constraints.first) { - Object *target; + //Object *target; bConstraint *con; TreeElement *ten; TreeElement *tenla= outliner_add_element(soops, &te->subtree, ob, te, TSE_CONSTRAINT_BASE, 0); int a= 0; - char *str; + //char *str; tenla->name= "Constraints"; for(con= ob->constraints.first; con; con= con->next, a++) { diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index fa87a054293..321a56c5ebd 100644 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -86,6 +86,7 @@ #include "BSE_drawipo.h" #include "BSE_editnla_types.h" /* for NLAWIDTH */ #include "BSE_editaction_types.h" +#include "BSE_time.h" #include "BSE_view.h" #include "BLI_arithb.h" |