[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25702] trunk/blender/source/blender/ blenloader/intern/readfile.c: check if newlibadr returns a valid pointer when running do-versions on animviz data
Campbell Barton
ideasman42 at gmail.com
Mon Jan 4 15:22:24 CET 2010
Revision: 25702
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25702
Author: campbellbarton
Date: 2010-01-04 15:22:22 +0100 (Mon, 04 Jan 2010)
Log Message:
-----------
check if newlibadr returns a valid pointer when running do-versions on animviz data
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-01-04 13:29:55 UTC (rev 25701)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-01-04 14:22:22 UTC (rev 25702)
@@ -10339,47 +10339,49 @@
/* if armature, copy settings for pose from armature data */
if (ob->pose && ob->data) {
bArmature *arm= newlibadr(fd, lib, ob->data);
- bAnimVizSettings *avs= &ob->pose->avs;
-
- /* ghosting settings ---------------- */
- /* ranges */
- avs->ghost_bc= avs->ghost_ac= arm->ghostep;
-
- avs->ghost_sf= arm->ghostsf;
- avs->ghost_ef= arm->ghostef;
-
- /* type */
- avs->ghost_type= arm->ghosttype;
-
- /* stepsize */
- avs->ghost_step= arm->ghostsize;
-
- /* path settings --------------------- */
- /* ranges */
- avs->path_bc= arm->pathbc;
- avs->path_ac= arm->pathac;
-
- avs->path_sf= arm->pathsf;
- avs->path_ef= arm->pathef;
-
- /* flags */
- if (arm->pathflag & ARM_PATH_FNUMS)
- avs->path_viewflag |= MOTIONPATH_VIEW_FNUMS;
- if (arm->pathflag & ARM_PATH_KFRAS)
- avs->path_viewflag |= MOTIONPATH_VIEW_KFRAS;
- if (arm->pathflag & ARM_PATH_KFNOS)
- avs->path_viewflag |= MOTIONPATH_VIEW_KFNOS;
-
- /* bake flags */
- if (arm->pathflag & ARM_PATH_HEADS)
- avs->path_bakeflag |= MOTIONPATH_BAKE_HEADS;
-
- /* type */
- if (arm->pathflag & ARM_PATH_ACFRA)
- avs->path_type = MOTIONPATH_TYPE_ACFRA;
-
- /* stepsize */
- avs->path_step= arm->pathsize;
+ if(arm) { /* XXX - why does this fail in some cases? */
+ bAnimVizSettings *avs= &ob->pose->avs;
+
+ /* ghosting settings ---------------- */
+ /* ranges */
+ avs->ghost_bc= avs->ghost_ac= arm->ghostep;
+
+ avs->ghost_sf= arm->ghostsf;
+ avs->ghost_ef= arm->ghostef;
+
+ /* type */
+ avs->ghost_type= arm->ghosttype;
+
+ /* stepsize */
+ avs->ghost_step= arm->ghostsize;
+
+ /* path settings --------------------- */
+ /* ranges */
+ avs->path_bc= arm->pathbc;
+ avs->path_ac= arm->pathac;
+
+ avs->path_sf= arm->pathsf;
+ avs->path_ef= arm->pathef;
+
+ /* flags */
+ if (arm->pathflag & ARM_PATH_FNUMS)
+ avs->path_viewflag |= MOTIONPATH_VIEW_FNUMS;
+ if (arm->pathflag & ARM_PATH_KFRAS)
+ avs->path_viewflag |= MOTIONPATH_VIEW_KFRAS;
+ if (arm->pathflag & ARM_PATH_KFNOS)
+ avs->path_viewflag |= MOTIONPATH_VIEW_KFNOS;
+
+ /* bake flags */
+ if (arm->pathflag & ARM_PATH_HEADS)
+ avs->path_bakeflag |= MOTIONPATH_BAKE_HEADS;
+
+ /* type */
+ if (arm->pathflag & ARM_PATH_ACFRA)
+ avs->path_type = MOTIONPATH_TYPE_ACFRA;
+
+ /* stepsize */
+ avs->path_step= arm->pathsize;
+ }
}
}
More information about the Bf-blender-cvs
mailing list