← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/modifiers/intern/MOD_meshcache.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/modifiers/intern/MOD_meshcache.c
96
96
        BLI_strncpy(tmcmd->filepath, mcmd->filepath, sizeof(tmcmd->filepath));
97
97
}
98
98
 
99
 
static int dependsOnTime(ModifierData *md)
 
99
static bool dependsOnTime(ModifierData *md)
100
100
{
101
101
        MeshCacheModifierData *mcmd = (MeshCacheModifierData *)md;
102
102
        return (mcmd->play_mode == MOD_MESHCACHE_PLAY_CFEA);
103
103
}
104
104
 
105
 
static int isDisabled(ModifierData *md, int UNUSED(useRenderParams))
 
105
static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
106
106
{
107
107
        MeshCacheModifierData *mcmd = (MeshCacheModifierData *) md;
108
108
 
251
251
        /* -------------------------------------------------------------------- */
252
252
        /* Apply the transformation matrix (if needed) */
253
253
        if (UNLIKELY(err_str)) {
254
 
                modifier_setError("%s", &mcmd->modifier, err_str);
 
254
                modifier_setError(&mcmd->modifier, "%s", err_str);
255
255
        }
256
256
        else if (ok) {
257
257
                bool use_matrix = false;