Some small fixes and changes:
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Oct 2011 17:09:31 +0000 (17:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Oct 2011 17:09:31 +0000 (17:09 +0000)
- Add *.cc files to qtcreator project as well as .cpp and .cxx
  (would be needed for correct generating projects with libmv library).
- Added negate_v2 and negate_v2_v2 functions. They'll be needed for
  camera tracking project.
- Fixed issue with generating proxies from 32bit images.
  (generated jpg-s opened fine in blender, but were dark in osx viewer).
- Marked unused arg in indexer as UNUSED.

build_files/cmake/project_info.py
source/blender/blenkernel/intern/sequencer.c

index 8e813d3..f57778f 100755 (executable)
@@ -104,7 +104,7 @@ def is_glsl(filename):
 
 def is_c(filename):
     ext = splitext(filename)[1]
 
 def is_c(filename):
     ext = splitext(filename)[1]
-    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
+    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc"))
 
 
 def is_c_any(filename):
 
 
 def is_c_any(filename):
index 6b319e6..3dcbe03 100644 (file)
@@ -2505,6 +2505,9 @@ static void *seq_prefetch_thread(void * This_)
 
                for (e = prefetch_done.first; e; e = e->next) {
                        if (s_last > e->monoton_cfra) {
 
                for (e = prefetch_done.first; e; e = e->next) {
                        if (s_last > e->monoton_cfra) {
+                               if (e->ibuf) {
+                                       IMB_cache_limiter_unref(e->ibuf);
+                               }
                                BLI_remlink(&prefetch_done, e);
                                MEM_freeN(e);
                        }
                                BLI_remlink(&prefetch_done, e);
                                MEM_freeN(e);
                        }
@@ -2582,6 +2585,9 @@ static void seq_stop_threads()
        }
 
        for (e = prefetch_done.first; e; e = e->next) {
        }
 
        for (e = prefetch_done.first; e; e = e->next) {
+               if (e->ibuf) {
+                       IMB_cache_limiter_unref(e->ibuf);
+               }
                BLI_remlink(&prefetch_done, e);
                MEM_freeN(e);
        }
                BLI_remlink(&prefetch_done, e);
                MEM_freeN(e);
        }