Revision: 41256
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41256
Author: nazgul
Date: 2011-10-24 17:09:31 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Some small fixes and changes:
- 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.
Modified Paths:
--------------
trunk/blender/build_files/cmake/project_info.py
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenlib/BLI_math_vector.h
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/imbuf/intern/indexer.c
Modified: trunk/blender/build_files/cmake/project_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_info.py 2011-10-24 16:41:28 UTC
(rev 41255)
+++ trunk/blender/build_files/cmake/project_info.py 2011-10-24 17:09:31 UTC
(rev 41256)
@@ -104,7 +104,7 @@
def is_c(filename):
ext = splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc"))
def is_c_any(filename):
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-10-24
16:41:28 UTC (rev 41255)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-10-24
17:09:31 UTC (rev 41256)
@@ -1324,6 +1324,10 @@
quality = seq->strip->proxy->quality;
ibuf->ftype= JPG | quality;
+ /* unsupported feature only confuses other s/w */
+ if(ibuf->depth==32)
+ ibuf->depth= 24;
+
BLI_make_existing_file(name);
ok = IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat);
Modified: trunk/blender/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_vector.h 2011-10-24
16:41:28 UTC (rev 41255)
+++ trunk/blender/source/blender/blenlib/BLI_math_vector.h 2011-10-24
17:09:31 UTC (rev 41256)
@@ -92,6 +92,8 @@
MINLINE void madd_v3_v3v3v3(float r[3], const float a[3], const float b[3],
const float c[3]);
MINLINE void madd_v4_v4fl(float r[4], const float a[4], float f);
+MINLINE void negate_v2(float r[2]);
+MINLINE void negate_v2_v2(float r[2], const float a[2]);
MINLINE void negate_v3(float r[3]);
MINLINE void negate_v3_v3(float r[3], const float a[3]);
MINLINE void negate_v4(float r[4]);
Modified: trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
2011-10-24 16:41:28 UTC (rev 41255)
+++ trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
2011-10-24 17:09:31 UTC (rev 41256)
@@ -308,6 +308,18 @@
r[2] = v1[2] * v2[2];
}
+MINLINE void negate_v2(float r[3])
+{
+ r[0]= -r[0];
+ r[1]= -r[1];
+}
+
+MINLINE void negate_v2_v2(float r[2], const float a[2])
+{
+ r[0]= -a[0];
+ r[1]= -a[1];
+}
+
MINLINE void negate_v3(float r[3])
{
r[0]= -r[0];
Modified: trunk/blender/source/blender/imbuf/intern/indexer.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer.c 2011-10-24 16:41:28 UTC
(rev 41255)
+++ trunk/blender/source/blender/imbuf/intern/indexer.c 2011-10-24 17:09:31 UTC
(rev 41256)
@@ -452,7 +452,7 @@
static struct proxy_output_ctx * alloc_proxy_output_ffmpeg(
struct anim * anim,
AVStream * st, int proxy_size, int width, int height,
- int quality)
+ int UNUSED(quality))
{
struct proxy_output_ctx * rv = MEM_callocN(
sizeof(struct proxy_output_ctx), "alloc_proxy_output");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
