[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27759] trunk/blender: Purging compiler warnings

Joshua Leung aligorith at gmail.com
Fri Mar 26 04:11:01 CET 2010


Revision: 27759
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27759
Author:   aligorith
Date:     2010-03-26 04:10:58 +0100 (Fri, 26 Mar 2010)

Log Message:
-----------
Purging compiler warnings

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_object.py
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py	2010-03-26 02:57:49 UTC (rev 27758)
+++ trunk/blender/release/scripts/ui/properties_object.py	2010-03-26 03:10:58 UTC (rev 27759)
@@ -296,7 +296,8 @@
         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")

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2010-03-26 02:57:49 UTC (rev 27758)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2010-03-26 03:10:58 UTC (rev 27759)
@@ -1687,7 +1687,7 @@
 		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 @@
 	cache->flag &= ~PTCACHE_SIMULATION_VALID;
 	cache->simframe = 0;
 	cache->last_exact = 0;
-}
\ No newline at end of file
+}
+

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-03-26 02:57:49 UTC (rev 27758)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-03-26 03:10:58 UTC (rev 27759)
@@ -4158,7 +4158,6 @@
 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;





More information about the Bf-blender-cvs mailing list