[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46121] trunk/blender/source/blender/ blenloader/intern/readfile.c: Versioning patch fix for files from tomato branch

[Sergey Sharybin]

Revision: 46121
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46121
Author:   nazgul
Date:     2012-04-30 16:19:08 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Versioning patch fix for files from tomato branch

Quite harmless but it was silly mistake i a code probably introduced by
some automatic svn merge.

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	2012-04-30 14:52:30 UTC (rev 46120)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-04-30 16:19:08 UTC (rev 46121)
@@ -12849,15 +12849,15 @@
 								v3d->bundle_size= 0.2f;
 								v3d->flag2 |= V3D_SHOW_RECONSTRUCTION;
 							}
-							else if (sl->spacetype==SPACE_CLIP) {
-								SpaceClip *sc= (SpaceClip *)sl;
-								if (sc->scopes.track_preview_height==0)
-									sc->scopes.track_preview_height= 120;
-							}
 
 							if (v3d->bundle_drawtype==0)
 								v3d->bundle_drawtype= OB_PLAINAXES;
 						}
+						else if (sl->spacetype==SPACE_CLIP) {
+							SpaceClip *sc= (SpaceClip *)sl;
+							if (sc->scopes.track_preview_height==0)
+								sc->scopes.track_preview_height= 120;
+						}
 					}
 				}
 			}