Code cleanup and minor change to CMake's colalda detection to make
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 11 Aug 2012 10:32:27 +0000 (10:32 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 11 Aug 2012 10:32:27 +0000 (10:32 +0000)
it detect directory structure used for libs in our svn (<root>/include/<component>/include)

build_files/cmake/Modules/FindOpenCOLLADA.cmake
source/blender/blenkernel/intern/sequencer.c

index 77c8b09..169d3a8 100644 (file)
@@ -81,6 +81,7 @@ FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
       # 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}
     )
index 419abb7..4f1b324 100644 (file)
@@ -1128,15 +1128,13 @@ static int seq_proxy_get_fname(Sequence *seq, int cfra, int render_size, char *n
        /* 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 @@ static ImBuf *seq_proxy_fetch(SeqRenderData context, Sequence *seq, int cfra)
  
                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) {