[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49797] trunk/blender: Code cleanup and minor change to CMake's colalda detection to make

[Sergey Sharybin]

Revision: 49797
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49797
Author:   nazgul
Date:     2012-08-11 10:32:27 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Code cleanup and minor change to CMake's colalda detection to make
it detect directory structure used for libs in our svn (<root>/include/<component>/include)

Modified Paths:
--------------
    trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2012-08-11 09:32:25 UTC (rev 49796)
+++ trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2012-08-11 10:32:27 UTC (rev 49797)
@@ -81,6 +81,7 @@
       # Alternative would be to suffix all members of search path
       # but this is less trouble, just looks strange.
       include/opencollada/${COMPONENT}
+      include/${COMPONENT}/include
     HINTS
       ${_opencollada_SEARCH_DIRS}
     )

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-11 09:32:25 UTC (rev 49796)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-11 10:32:27 UTC (rev 49797)
@@ -1128,15 +1128,13 @@
 	/* generate a separate proxy directory for each preview size */
 
 	if (seq->type == SEQ_TYPE_IMAGE) {
-		BLI_snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy", dir,
-		             render_size,
+		BLI_snprintf(name, PROXY_MAXFILE, "%s/images/%d/%s_proxy", dir, render_size,
 		             BKE_sequencer_give_stripelem(seq, cfra)->name);
 		frameno = 1;
 	}
 	else {
 		frameno = (int)give_stripelem_index(seq, cfra) + seq->anim_startofs;
-		BLI_snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir, 
-		             render_size);
+		BLI_snprintf(name, PROXY_MAXFILE, "%s/proxy_misc/%d/####", dir, render_size);
 	}
 
 	BLI_path_abs(name, G.main->name);
@@ -1185,11 +1183,9 @@
  
 		seq_open_anim_file(seq);
 
-		frameno = IMB_anim_index_get_frame_index(seq->anim, seq->strip->proxy->tc,
-		                                         frameno);
+		frameno = IMB_anim_index_get_frame_index(seq->anim, seq->strip->proxy->tc, frameno);
 
-		return IMB_anim_absolute(seq->strip->proxy->anim, frameno,
-		                         IMB_TC_NONE, IMB_PROXY_NONE);
+		return IMB_anim_absolute(seq->strip->proxy->anim, frameno, IMB_TC_NONE, IMB_PROXY_NONE);
 	}
  
 	if (seq_proxy_get_fname(seq, cfra, render_size, name) == 0) {