Revision: 42636
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42636
Author: moguri
Date: 2011-12-15 00:10:51 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Merge with trunk up to r42632.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42632
Modified Paths:
--------------
branches/ge_harmony/build_files/buildbot/config/user-config-i686.py
branches/ge_harmony/build_files/buildbot/config/user-config-player-x86_64.py
branches/ge_harmony/build_files/buildbot/config/user-config-x86_64.py
branches/ge_harmony/intern/audaspace/intern/AUD_C-API.cpp
branches/ge_harmony/intern/cycles/device/device_cuda.cpp
branches/ge_harmony/release/datafiles/splash.png
branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
branches/ge_harmony/source/blender/editors/datafiles/splash.png.c
branches/ge_harmony/source/blender/editors/space_clip/clip_ops.c
branches/ge_harmony/source/blender/editors/space_clip/tracking_ops.c
branches/ge_harmony/source/blender/makesrna/intern/rna_fcurve.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/ge_harmony/
Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:42243-42593
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:42243-42632
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-i686.py
2011-12-14 23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-i686.py
2011-12-15 00:10:51 UTC (rev 42636)
@@ -96,6 +96,7 @@
# Cycles
WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified:
branches/ge_harmony/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
---
branches/ge_harmony/build_files/buildbot/config/user-config-player-x86_64.py
2011-12-14 23:53:46 UTC (rev 42635)
+++
branches/ge_harmony/build_files/buildbot/config/user-config-player-x86_64.py
2011-12-15 00:10:51 UTC (rev 42636)
@@ -95,5 +95,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/ge_harmony/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/ge_harmony/build_files/buildbot/config/user-config-x86_64.py
2011-12-14 23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/build_files/buildbot/config/user-config-x86_64.py
2011-12-15 00:10:51 UTC (rev 42636)
@@ -96,6 +96,7 @@
# Cycles
WITH_BF_CYCLES = True
+WITH_BF_CYCLES_CUDA_BINARIES = True
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
@@ -116,5 +117,5 @@
# Compilation and optimization
BF_DEBUG = False
-REL_CCFLAGS = ['-O2'] # C & C++
+REL_CCFLAGS = ['-O2', '-msse', '-msse2'] # C & C++
PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64']
Modified: branches/ge_harmony/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/ge_harmony/intern/audaspace/intern/AUD_C-API.cpp 2011-12-14
23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/intern/audaspace/intern/AUD_C-API.cpp 2011-12-15
00:10:51 UTC (rev 42636)
@@ -137,9 +137,22 @@
#endif
#ifdef WITH_JACK
case AUD_JACK_DEVICE:
- dev = new AUD_JackDevice("Blender", specs, buffersize);
- break;
+#ifdef __APPLE__
+ struct stat st;
+ if(stat("/Library/Frameworks/Jackmp.framework", &st) !=
0)
+ {
+ printf("Warning: Jack Framework not
installed\n");
+ // No break, fall through to default, to return
false
+ }
+ else
+ {
#endif
+ dev = new AUD_JackDevice("Blender", specs,
buffersize);
+ break;
+#ifdef __APPLE__
+ }
+#endif
+#endif
default:
return false;
}
Modified: branches/ge_harmony/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/ge_harmony/intern/cycles/device/device_cuda.cpp 2011-12-14
23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/intern/cycles/device/device_cuda.cpp 2011-12-15
00:10:51 UTC (rev 42636)
@@ -255,7 +255,7 @@
if(major <= 1 && minor <= 2)
cuda_error(string_printf("CUDA device supported only
with shader model 1.3 or up, found %d.%d.", major, minor));
else
- cuda_error("CUDA binary kernel for this graphics card
shader model (%d.%d) not found.", major, minor);
+ cuda_error(string_printf("CUDA binary kernel for this
graphics card shader model (%d.%d) not found.", major, minor));
return "";
#else
/* if not, find CUDA compiler */
Modified: branches/ge_harmony/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: branches/ge_harmony/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/BKE_blender.h 2011-12-14
23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/source/blender/blenkernel/BKE_blender.h 2011-12-15
00:10:51 UTC (rev 42636)
@@ -41,17 +41,17 @@
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
-#define BLENDER_VERSION 260
-#define BLENDER_SUBVERSION 8
+#define BLENDER_VERSION 261
+#define BLENDER_SUBVERSION 0
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR a
+#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE rc
+#define BLENDER_VERSION_CYCLE release
extern char versionstr[]; /* from blender.c */
Modified: branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
2011-12-14 23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/source/blender/blenkernel/BKE_tracking.h
2011-12-15 00:10:51 UTC (rev 42636)
@@ -85,7 +85,7 @@
/* 2D tracking */
struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip,
struct MovieClipUser *user,
- short backwards, short disable_failed);
+ short backwards, short disable_failed, short sequence);
void BKE_tracking_context_free(struct MovieTrackingContext *context);
void BKE_tracking_sync(struct MovieTrackingContext *context);
void BKE_tracking_sync_user(struct MovieClipUser *user, struct
MovieTrackingContext *context);
Modified: branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
2011-12-14 23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
2011-12-15 00:10:51 UTC (rev 42636)
@@ -48,6 +48,7 @@
#include "BLI_ghash.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
+#include "BLI_threads.h"
#include "BKE_global.h"
#include "BKE_tracking.h"
@@ -735,11 +736,11 @@
MovieTrackingSettings settings;
TracksMap *tracks_map;
- short backwards, disable_failed;
+ short backwards, disable_failed, sequence;
int sync_frame;
} MovieTrackingContext;
-MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser
*user, short backwards, short disable_failed)
+MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser
*user, short backwards, short disable_failed, short sequence)
{
MovieTrackingContext *context=
MEM_callocN(sizeof(MovieTrackingContext), "trackingContext");
MovieTracking *tracking= &clip->tracking;
@@ -752,6 +753,7 @@
context->disable_failed= disable_failed;
context->sync_frame= user->framenr;
context->first_time= 1;
+ context->sequence= sequence;
/* count */
track= tracking->tracks.first;
@@ -830,6 +832,9 @@
context->clip= clip;
context->user= *user;
+ if(!sequence)
+ BLI_begin_threaded_malloc();
+
return context;
}
@@ -856,6 +861,9 @@
void BKE_tracking_context_free(MovieTrackingContext *context)
{
+ if(!context->sequence)
+ BLI_end_threaded_malloc();
+
tracks_map_free(context->tracks_map, track_context_free);
MEM_freeN(context);
Modified: branches/ge_harmony/source/blender/editors/datafiles/splash.png.c
===================================================================
--- branches/ge_harmony/source/blender/editors/datafiles/splash.png.c
2011-12-14 23:53:46 UTC (rev 42635)
+++ branches/ge_harmony/source/blender/editors/datafiles/splash.png.c
2011-12-15 00:10:51 UTC (rev 42636)
@@ -1,4817 +1,6113 @@
/* DataToC output of file <splash_png> */
-int datatoc_splash_png_size= 153933;
+int datatoc_splash_png_size= 195415;
char datatoc_splash_png[]= {
-137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73,
- 72, 68, 82, 0, 0, 1,245, 0, 0, 1, 26, 8, 6, 0, 0, 0, 8, 90,206,
70, 0, 0, 10, 79,105, 67, 67, 80, 80,104,111,116,
-111,115,104,111,112, 32, 73, 67, 67, 32,112,114,111,102,105,108,101, 0,
0,120,218,157, 83,103, 84, 83,233, 22, 61,247,222,244,
- 66, 75,136,128,148, 75,111, 82, 21, 8, 32, 82, 66,139,128, 20,145, 38, 42,
33, 9, 16, 74,136, 33,161,217, 21, 81,193, 17, 69,
- 69, 4, 27,200,160,136, 3,142,142,128,140, 21, 81, 44, 12,138, 10,216,
7,228, 33,162,142,131,163,136,138,202,251,225,123,163,
-107,214,188,247,230,205,254,181,215, 62,231,172,243,157,179,207, 7,192, 8,
12,150, 72, 51, 81, 53,128, 12,169, 66, 30, 17,224,
-131,199,196,198,225,228, 46, 64,129, 10, 36,112, 0, 16, 8,179,100,
33,115,253, 35, 1, 0,248,126, 60, 60, 43, 34,192, 7,190,
- 0, 1,120,211, 11, 8, 0,192, 77,155,192, 48, 28,135,255, 15,234, 66,153,
92, 1,128,132, 1,192,116,145, 56, 75, 8,128, 20,
- 0, 64,122,142, 66,166, 0, 64, 70, 1,128,157,152, 38, 83, 0,160, 4, 0,
96,203, 99, 98,227, 0, 80, 45, 0, 96, 39,127,230,
-211, 0,128,157,248,153,123, 1, 0, 91,148, 33, 21, 1,160,145, 0, 32,
19,101,136, 68, 0,104, 59, 0,172,207, 86,138, 69, 0,
- 88, 48, 0, 20,102, 75,196, 57, 0,216, 45, 0, 48, 73, 87,102, 72,
0,176,183, 0,192,206, 16, 11,178, 0, 8, 12, 0, 48, 81,
-136,133, 41, 0, 4,123, 0, 96,200, 35, 35,120, 0,132,153, 0, 20, 70,242,
87, 60,241, 43,174, 16,231, 42, 0, 0,120,153,178,
- 60,185, 36, 57, 69,129, 91, 8, 45,113, 7, 87, 87, 46, 30, 40,206, 73, 23,
43, 20, 54, 97, 2, 97,154, 64, 46,194,121,153, 25,
- 50,129, 52, 15,224,243,204, 0, 0,160,145, 21, 17,224,131,243,253,120,206,
14,174,206,206, 54,142,182, 14, 95, 45,234,191, 6,
-255, 34, 98, 98,227,254,229,207,171,112, 64, 0, 0,225,116,126,209,254, 44,
47,179, 26,128, 59, 6,128,109,254,162, 37,238, 4,
-104, 94, 11,160,117,247,139,102,178, 15, 64,181, 0,160,233,218,
87,243,112,248,126, 60, 60, 69,161,144,185,217,217,229,228,228,
-216, 74,196, 66, 91, 97,202, 87,125,254,103,194, 95,192, 87,253,108,249,126,
60,252,247,245,224,190,226, 36,129, 50, 93,129, 71,
- 4,248,224,194,204,244, 76,165, 28,207,146, 9,132, 98,220,230,143,
71,252,183, 11,255,252, 29,211, 34,196, 73, 98,185, 88, 42,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
