[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12338] trunk/blender/source/blender: Several fixes:
Joshua Leung
aligorith at gmail.com
Mon Oct 22 08:28:39 CEST 2007
Revision: 12338
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12338
Author: aligorith
Date: 2007-10-22 08:28:39 +0200 (Mon, 22 Oct 2007)
Log Message:
-----------
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)
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/src/drawview.c
trunk/blender/source/blender/src/editsima.c
trunk/blender/source/blender/src/outliner.c
trunk/blender/source/blender/src/transform.c
Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h 2007-10-22 05:35:59 UTC (rev 12337)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h 2007-10-22 06:28:39 UTC (rev 12338)
@@ -162,7 +162,7 @@
/* 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 @@
};
/* 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 @@
} 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),
Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c 2007-10-22 05:35:59 UTC (rev 12337)
+++ trunk/blender/source/blender/src/drawview.c 2007-10-22 06:28:39 UTC (rev 12338)
@@ -1509,8 +1509,8 @@
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";
Modified: trunk/blender/source/blender/src/editsima.c
===================================================================
--- trunk/blender/source/blender/src/editsima.c 2007-10-22 05:35:59 UTC (rev 12337)
+++ trunk/blender/source/blender/src/editsima.c 2007-10-22 06:28:39 UTC (rev 12338)
@@ -1634,7 +1634,7 @@
} 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;
Modified: trunk/blender/source/blender/src/outliner.c
===================================================================
--- trunk/blender/source/blender/src/outliner.c 2007-10-22 05:35:59 UTC (rev 12337)
+++ trunk/blender/source/blender/src/outliner.c 2007-10-22 06:28:39 UTC (rev 12338)
@@ -591,11 +591,11 @@
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 @@
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++) {
Modified: trunk/blender/source/blender/src/transform.c
===================================================================
--- trunk/blender/source/blender/src/transform.c 2007-10-22 05:35:59 UTC (rev 12337)
+++ trunk/blender/source/blender/src/transform.c 2007-10-22 06:28:39 UTC (rev 12338)
@@ -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"
More information about the Bf-blender-cvs
mailing list