Purging compiler warnings
authorJoshua Leung <aligorith@gmail.com>
Fri, 26 Mar 2010 03:10:58 +0000 (03:10 +0000)
committerJoshua Leung <aligorith@gmail.com>
Fri, 26 Mar 2010 03:10:58 +0000 (03:10 +0000)
release/scripts/ui/properties_object.py
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/transform/transform_conversions.c

index 5c13d778049e4f0a750c38adf3be1b752d26ee4e..d83253bf77182ad650f6cf6270ada807033fa789 100644 (file)
@@ -296,7 +296,8 @@ class OBJECT_PT_animation(ObjectButtonsPanel):
         col.prop(ob, "time_offset", text="Offset")
                
         # XXX: these are still used for a few curve-related tracking features
-        col = split.column()
+        if wide_ui:
+            col = split.column()
         col.label(text="Tracking Axes:")
         col.prop(ob, "track_axis", text="Axis")
         col.prop(ob, "up_axis", text="Up Axis")
index 9f0c72893503c954065bb167c23e78450952beef..cbe294f134771a57bf2eced900bed3fd35735ede 100644 (file)
@@ -1687,7 +1687,7 @@ int BKE_ptcache_write_cache(PTCacheID *pid, int cfra)
                return 0;
 
        if(cache->flag & PTCACHE_DISK_CACHE) {
-               int ofra, efra = cache->endframe;
+               int ofra=0, efra = cache->endframe;
 
                if(cfra==0)
                        add = 1;
@@ -2871,4 +2871,5 @@ void BKE_ptcache_invalidate(PointCache *cache)
        cache->flag &= ~PTCACHE_SIMULATION_VALID;
        cache->simframe = 0;
        cache->last_exact = 0;
-}
\ No newline at end of file
+}
+
index eed6c65362c7fa760cbb95d52f703187aa376c20..96616f57575bcaac090aee1ce2c25328eb2284c2 100644 (file)
@@ -4158,7 +4158,6 @@ static void createTransSeqData(bContext *C, TransInfo *t)
 static void ObjectToTransData(bContext *C, TransInfo *t, TransData *td, Object *ob)
 {
        Scene *scene = t->scene;
-       Object *track;
        float obmtx[3][3];
        short constinv;
        short skip_invert = 0;