[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56409] branches/soc-2011-tomato: Merging r56389 through r56408 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Tue Apr 30 09:58:42 CEST 2013


Revision: 56409
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56409
Author:   nazgul
Date:     2013-04-30 07:58:42 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Merging r56389 through r56408 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56389
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56408

Modified Paths:
--------------
    branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/view3d.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_brush.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_blend_inline.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_2d.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-tomato/source/blender/freestyle/intern/view_map/Functions1D.cpp
    branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBuff.cpp

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56388
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-56408

Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py	2013-04-30 07:40:15 UTC (rev 56408)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py	2013-04-30 07:58:42 UTC (rev 56409)
@@ -1045,7 +1045,7 @@
             if prop.identifier in struct_blacklist:
                 continue
 
-            type_descr = prop.get_type_description(class_fmt=":class:`%s`", collection_id=_BPY_PROP_COLLECTION_ID)
+            type_descr = prop.get_type_description(class_fmt=":class:`bpy.types.%s`", collection_id=_BPY_PROP_COLLECTION_ID)
             fw(".. data:: %s\n\n" % prop.identifier)
             if prop.description:
                 fw("   %s\n\n" % prop.description)

Modified: branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h	2013-04-30 07:40:15 UTC (rev 56408)
+++ branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h	2013-04-30 07:58:42 UTC (rev 56409)
@@ -29,6 +29,12 @@
 #endif
 /* end sanity check */
 
+/* visual studio 2012 does not define inline for C */
+#ifdef _MSC_VER
+#define FFMPEG_INLINE static __inline
+#else
+#define FFMPEG_INLINE static inline
+#endif
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/rational.h>
@@ -89,7 +95,7 @@
 #define FFMPEG_SAMPLE_FMT_S16P_SUPPORTED
 #else
 
-static inline
+FFMPEG_INLINE
 int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt)
 {
 	/* no planar formats in FFmpeg < 0.9 */
@@ -98,7 +104,7 @@
 
 #endif
 
-static inline
+FFMPEG_INLINE
 int av_get_cropped_height_from_codec(AVCodecContext *pCodecCtx)
 {
 	int y = pCodecCtx->height;
@@ -127,7 +133,7 @@
 }
 
 #if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
-static inline
+FFMPEG_INLINE
 int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
 {
 	const AVOption *rv = NULL;
@@ -135,7 +141,7 @@
 	return rv != NULL;
 }
 
-static inline
+FFMPEG_INLINE
 int av_opt_set_int(void *obj, const char *name, int64_t val, int search_flags)
 {
 	const AVOption *rv = NULL;
@@ -143,7 +149,7 @@
 	return rv != NULL;
 }
 
-static inline
+FFMPEG_INLINE
 int av_opt_set_double(void *obj, const char *name, double val, int search_flags)
 {
 	const AVOption *rv = NULL;
@@ -160,7 +166,7 @@
 #endif
 
 #if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 54))
-static inline
+FFMPEG_INLINE
 enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt)
 {
     if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB)
@@ -174,7 +180,7 @@
 #endif
 
 #if ((LIBAVCODEC_VERSION_MAJOR < 53) || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR < 35))
-static inline
+FFMPEG_INLINE
 int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
 {
 	/* TODO: no options are taking into account */
@@ -183,14 +189,14 @@
 #endif
 
 #if ((LIBAVFORMAT_VERSION_MAJOR < 53) || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR < 21))
-static inline
+FFMPEG_INLINE
 AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c)
 {
 	/* TODO: no codec is taking into account */
 	return av_new_stream(s, 0);
 }
 
-static inline
+FFMPEG_INLINE
 int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
 {
 	/* TODO: no options are taking into account */
@@ -199,7 +205,7 @@
 #endif
 
 #if ((LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR > 32)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR == 24) && (LIBAVFORMAT_VERSION_MICRO >= 100)))
-static inline
+FFMPEG_INLINE
 void my_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
 {
 	int i;
@@ -213,7 +219,7 @@
 	}
 }
 
-static inline
+FFMPEG_INLINE
 void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
 {
 	my_update_cur_dts(s, ref_st, timestamp);
@@ -221,7 +227,7 @@
 #endif
 
 #if ((LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 54 && LIBAVCODEC_VERSION_MINOR < 28))
-static inline
+FFMPEG_INLINE
 void avcodec_free_frame(AVFrame **frame)
 {
 	/* don't need to do anything with old AVFrame
@@ -278,7 +284,7 @@
 #endif
 
 #ifndef FFMPEG_HAVE_DECODE_AUDIO3
-static inline 
+FFMPEG_INLINE 
 int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
 			  int *frame_size_ptr, AVPacket *avpkt)
 {
@@ -289,7 +295,7 @@
 #endif
 
 #ifndef FFMPEG_HAVE_DECODE_VIDEO2
-static inline
+FFMPEG_INLINE
 int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
                          int *got_picture_ptr,
                          AVPacket *avpkt)
@@ -299,7 +305,7 @@
 }
 #endif
 
-static inline
+FFMPEG_INLINE
 int64_t av_get_pts_from_frame(AVFormatContext *avctx, AVFrame * picture)
 {
 	int64_t pts = picture->pkt_pts;

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-04-30 07:40:15 UTC (rev 56408)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-04-30 07:58:42 UTC (rev 56409)
@@ -904,7 +904,7 @@
 	GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized");
 
 	if (hwnd) {
-		GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLong(hwnd, GWL_USERDATA);
+		GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLongPtr(hwnd, GWL_USERDATA);
 		if (window) {
 			switch (msg) {
 				// we need to check if new key layout has AltGr

Modified: branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py	2013-04-30 07:40:15 UTC (rev 56408)
+++ branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils.py	2013-04-30 07:58:42 UTC (rev 56409)
@@ -463,7 +463,8 @@
                     tmp[real_key] = msg
             done_keys.add(key)
             if '%' in msgid and msgstr and len(_format(msgid)) != len(_format(msgstr)):
-                ret.append("Error! msg's format entities are not matched in msgid and msgstr ({})".format(real_key))
+                if not msg.is_fuzzy:
+                    ret.append("Error! msg's format entities are not matched in msgid and msgstr ({})".format(real_key))
                 if fix:
                     msg.msgstr = ""
         for k in rem:

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py	2013-04-30 07:40:15 UTC (rev 56408)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py	2013-04-30 07:58:42 UTC (rev 56409)
@@ -60,6 +60,12 @@
 
         ('Object Non-modal', 'EMPTY', 'WINDOW', []),  # mode change
 
+        ('View3D Fly Modal', 'EMPTY', 'WINDOW', []),
+        ('View3D Rotate Modal', 'EMPTY', 'WINDOW', []),
+        ('View3D Move Modal', 'EMPTY', 'WINDOW', []),
+        ('View3D Zoom Modal', 'EMPTY', 'WINDOW', []),
+        ('View3D Dolly Modal', 'EMPTY', 'WINDOW', []),
+
         ('3D View Generic', 'VIEW_3D', 'WINDOW', []),    # toolbar and properties
         ]),
 
@@ -122,11 +128,6 @@
 
     ('Standard Modal Map', 'EMPTY', 'WINDOW', []),
     ('Transform Modal Map', 'EMPTY', 'WINDOW', []),
-    ('View3D Fly Modal', 'EMPTY', 'WINDOW', []),
-    ('View3D Rotate Modal', 'EMPTY', 'WINDOW', []),
-    ('View3D Move Modal', 'EMPTY', 'WINDOW', []),
-    ('View3D Zoom Modal', 'EMPTY', 'WINDOW', []),
-    ('View3D Dolly Modal', 'EMPTY', 'WINDOW', []),
     ]
 
 

Modified: branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py	2013-04-30 07:40:15 UTC (rev 56408)
+++ branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py	2013-04-30 07:58:42 UTC (rev 56409)
@@ -171,56 +171,56 @@
 kmi.properties.data_path = 'space_data.viewport_shade'
 kmi.properties.value_1 = 'SOLID'
 kmi.properties.value_2 = 'TEXTURED'
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE')
+kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK')
 kmi.properties.extend = False
 kmi.properties.deselect = False
 kmi.properties.toggle = False
 kmi.properties.center = False
 kmi.properties.enumerate = False
 kmi.properties.object = False
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', ctrl=True)
+kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', ctrl=True)
 kmi.properties.extend = False
 kmi.properties.deselect = False
 kmi.properties.toggle = True
 kmi.properties.center = False
 kmi.properties.enumerate = False
 kmi.properties.object = False
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'PRESS', shift=True)
+kmi = km.keymap_items.new('view3d.select_or_deselect_all', 'SELECTMOUSE', 'CLICK', shift=True)
 kmi.properties.extend = False
 kmi.properties.deselect = False
 kmi.properties.toggle = False
 kmi.properties.center = True
 kmi.properties.enumerate = False
 kmi.properties.object = True
-kmi = km.keymap_items.new('view3d.select', 'SELECTMOUSE', 'RELEASE', alt=True)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list