[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42903] branches/bmesh/blender: svn merge ^/trunk/blender -r42886:42902
Campbell Barton
ideasman42 at gmail.com
Tue Dec 27 14:28:38 CET 2011
Revision: 42903
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42903
Author: campbellbarton
Date: 2011-12-27 13:28:30 +0000 (Tue, 27 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42886:42902
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42886
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/source/blender/blenkernel/BKE_global.h
branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h
branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_movieclip_types.h
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_export.m
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/creator/CMakeLists.txt
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42886
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42902
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/CMakeLists.txt 2011-12-27 13:28:30 UTC (rev 42903)
@@ -660,7 +660,7 @@
if(WITH_OPENAL)
set(OPENAL ${LIBDIR}/openal)
set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
- set(OPENAL_LIBRARY wrap_oal)
+ set(OPENAL_LIBRARY OpenAL32)
set(OPENAL_LIBPATH ${OPENAL}/lib)
endif()
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/SConstruct 2011-12-27 13:28:30 UTC (rev 42903)
@@ -756,7 +756,6 @@
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
- dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
Modified: branches/bmesh/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linuxcross-config.py 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/build_files/scons/config/linuxcross-config.py 2011-12-27 13:28:30 UTC (rev 42903)
@@ -13,7 +13,7 @@
WITH_BF_STATICOPENAL = False
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
Modified: branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py 2011-12-27 13:28:30 UTC (rev 42903)
@@ -14,7 +14,7 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = True
Modified: branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/build_files/scons/config/win32-vc-config.py 2011-12-27 13:28:30 UTC (rev 42903)
@@ -20,7 +20,7 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_ICONV = True
Modified: branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-12-27 13:28:30 UTC (rev 42903)
@@ -20,7 +20,7 @@
WITH_BF_OPENAL = True
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_SNDFILE = True
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_global.h 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_global.h 2011-12-27 13:28:30 UTC (rev 42903)
@@ -141,6 +141,7 @@
#define G_FILE_RECOVER (1 << 23)
#define G_FILE_RELATIVE_REMAP (1 << 24)
#define G_FILE_HISTORY (1 << 25)
+#define G_FILE_MESH_COMPAT (1 << 26) /* BMesh option to save as older mesh format */
/* G.windowstate */
#define G_WINDOWSTATE_USERDEF 0
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h 2011-12-27 13:28:30 UTC (rev 42903)
@@ -60,7 +60,7 @@
void BKE_movieclip_get_cache_segments(struct MovieClip *clip, struct MovieClipUser *user, int *totseg_r, int **points_r);
-void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, struct MovieDistortion *distortion,
+void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
int cfra, int *build_sizes, int build_count, int undistorted);
#define TRACK_CLEAR_UPTO 0
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c 2011-12-27 13:28:30 UTC (rev 42903)
@@ -918,15 +918,17 @@
IMB_freeImBuf(scaleibuf);
}
-void BKE_movieclip_build_proxy_frame(MovieClip *clip, struct MovieDistortion *distortion,
+void BKE_movieclip_build_proxy_frame(MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
int cfra, int *build_sizes, int build_count, int undistorted)
{
ImBuf *ibuf;
MovieClipUser user;
user.framenr= cfra;
+ user.render_flag= 0;
+ user.render_size= MCLIP_PROXY_RENDER_SIZE_FULL;
- ibuf= BKE_movieclip_get_ibuf_flag(clip, &user, 0);
+ ibuf= BKE_movieclip_get_ibuf_flag(clip, &user, clip_flag);
if(ibuf) {
ImBuf *tmpibuf= ibuf;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2011-12-27 13:28:30 UTC (rev 42903)
@@ -730,6 +730,7 @@
typedef struct MovieTrackingContext {
MovieClipUser user;
MovieClip *clip;
+ int clip_flag;
int first_time, frames;
@@ -830,7 +831,20 @@
}
context->clip= clip;
+
+ /* store needed clip flags passing to get_buffer functions
+ * - MCLIP_USE_PROXY is needed to because timecode affects on movie clip
+ * only in case Proxy/Timecode flag is set, so store this flag to use
+ * timecodes properly but reset render size to SIZE_FULL so correct resolution
+ * would be used for images
+ * - MCLIP_USE_PROXY_CUSTOM_DIR is needed because proxy/timecode files might
+ * be stored in a different location
+ * ignore all the rest pssible flags for now */
+ context->clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS;
+
context->user= *user;
+ context->user.render_size= 0;
+ context->user.render_flag= MCLIP_PROXY_RENDER_SIZE_FULL;
if(!sequence)
BLI_begin_threaded_malloc();
@@ -1044,7 +1058,7 @@
user.framenr= framenr;
- ibuf= BKE_movieclip_get_ibuf_flag(context->clip, &user, 0);
+ ibuf= BKE_movieclip_get_ibuf_flag(context->clip, &user, context->clip_flag);
return ibuf;
}
@@ -1148,7 +1162,7 @@
if(context->backwards) context->user.framenr--;
else context->user.framenr++;
- ibuf_new= BKE_movieclip_get_ibuf_flag(context->clip, &context->user, 0);
+ ibuf_new= BKE_movieclip_get_ibuf_flag(context->clip, &context->user, context->clip_flag);
if(!ibuf_new)
return 0;
Modified: branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/writefile.c 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/source/blender/blenloader/intern/writefile.c 2011-12-27 13:28:30 UTC (rev 42903)
@@ -175,6 +175,10 @@
MemFile *compare, *current;
int tot, count, error, memsize;
+
+#ifdef USE_MESH_FORWARDS_COMAT
+ char use_mesh_compat; /* option to save with older mesh format */
+#endif
} WriteData;
static WriteData *writedata_new(int file)
@@ -2666,7 +2670,10 @@
fg.curscene= screen->scene;
fg.displaymode= G.displaymode;
fg.winpos= G.winpos;
- fg.fileflags= (fileflags & ~(G_FILE_NO_UI|G_FILE_RELATIVE_REMAP)); // prevent to save this, is not good convention, and feature with concerns...
+
+ /* prevent to save this, is not good convention, and feature with concerns... */
+ fg.fileflags= (fileflags & ~(G_FILE_NO_UI|G_FILE_RELATIVE_REMAP|G_FILE_MESH_COMPAT));
+
fg.globalf= G.f;
BLI_strncpy(fg.filename, mainvar->name, sizeof(fg.filename));
@@ -2709,7 +2716,11 @@
blo_split_main(&mainlist, mainvar);
wd= bgnwrite(handle, compare, current);
-
+
+#ifdef USE_MESH_FORWARDS_COMAT
+ wd->use_mesh_compat = (write_flags & G_FILE_MESH_COMPAT) != 0;
+#endif
+
sprintf(buf, "BLENDER%c%c%.3d", (sizeof(void*)==8)?'-':'_', (ENDIAN_ORDER==B_ENDIAN)?'V':'v', BLENDER_VERSION);
mywrite(wd, buf, 12);
Modified: branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c 2011-12-27 13:17:58 UTC (rev 42902)
+++ branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c 2011-12-27 13:28:30 UTC (rev 42903)
@@ -827,6 +827,7 @@
Scene *scene;
struct Main *main;
MovieClip *clip;
+ int clip_flag;
} ProxyJob;
static void proxy_freejob(void *pjv)
@@ -877,10 +878,10 @@
for(cfra= sfra; cfra<=efra; cfra++) {
if(clip->source != MCLIP_SRC_MOVIE)
- BKE_movieclip_build_proxy_frame(clip, NULL, cfra, build_sizes, build_count, 0);
+ BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, NULL, cfra, build_sizes, build_count, 0);
if(undistort)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list