[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43421] branches/bmesh/blender: svn merge ^/trunk/blender -r43392:43420

Campbell Barton ideasman42 at gmail.com
Mon Jan 16 12:50:23 CET 2012


Revision: 43421
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43421
Author:   campbellbarton
Date:     2012-01-16 11:50:17 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43392:43420

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

Modified Paths:
--------------
    branches/bmesh/blender/release/scripts/modules/animsys_refactor.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_main.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
    branches/bmesh/blender/source/blender/blenkernel/intern/image.c
    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/readfile.c
    branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
    branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_ops.c
    branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
    branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
    branches/bmesh/blender/source/blender/editors/object/object_ops.c
    branches/bmesh/blender/source/blender/editors/physics/physics_ops.c
    branches/bmesh/blender/source/blender/editors/render/render_opengl.c
    branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_utils.c
    branches/bmesh/blender/source/blender/editors/space_buttons/space_buttons.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_editor.c
    branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c
    branches/bmesh/blender/source/blender/editors/space_console/console_ops.c
    branches/bmesh/blender/source/blender/editors/space_console/space_console.c
    branches/bmesh/blender/source/blender/editors/space_file/space_file.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_image/space_image.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/bmesh/blender/source/blender/editors/space_text/space_text.c
    branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
    branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
    branches/bmesh/blender/source/blender/makesdna/DNA_brush_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_image_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_meta_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_movieclip_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
    branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sound_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_main.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43392
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43420


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43392
   + /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43420

Modified: branches/bmesh/blender/release/scripts/modules/animsys_refactor.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/animsys_refactor.py	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/release/scripts/modules/animsys_refactor.py	2012-01-16 11:50:17 UTC (rev 43421)
@@ -532,8 +532,6 @@
     ("ShaderNodeMapping", "minimum", "min"),
     ("ShaderNodeMapping", "clamp_maximum", "use_max"),
     ("ShaderNodeMapping", "clamp_minimum", "use_min"),
-    ("VertexPaint", "all_faces", "use_all_faces"),
-    ("VertexPaint", "spray", "use_spray"),
     ("ParticleEdit", "add_keys", "default_key_count"),
     ("ParticleEdit", "selection_mode", "select_mode"),
     ("ParticleEdit", "auto_velocity", "use_auto_velocity"),

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2012-01-16 11:50:17 UTC (rev 43421)
@@ -515,6 +515,17 @@
         layout = self.layout
         sc = context.space_data
 
+        row = layout.row(align=True)
+        sub = row.row()
+        sub.prop(sc, "show_red_channel", text="R", toggle=True)
+        sub.prop(sc, "show_green_channel", text="G", toggle=True)
+        sub.prop(sc, "show_blue_channel", text="B", toggle=True)
+
+        row.separator()
+
+        sub = row.row()
+        sub.prop(sc, "use_grayscale_preview", text="B/W", toggle=True)
+
         col = layout.column(align=True)
 
         col.prop(sc, "show_marker_pattern", text="Pattern")

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-01-16 11:50:17 UTC (rev 43421)
@@ -1070,9 +1070,10 @@
         wpaint = tool_settings.weight_paint
 
         col = layout.column()
-        col.prop(wpaint, "use_all_faces")
+
         col.prop(wpaint, "use_normal")
         col.prop(wpaint, "use_spray")
+        col.prop(wpaint, "use_group_restrict")
 
         obj = context.weight_paint_object
         if obj.type == 'MESH':

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_main.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_main.h	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_main.h	2012-01-16 11:50:17 UTC (rev 43421)
@@ -50,7 +50,7 @@
 
 typedef struct Main {
 	struct Main *next, *prev;
-	char name[240];
+	char name[240]; /* 240 = FILE_MAX */
 	short versionfile, subversionfile;
 	short minversionfile, minsubversionfile;
 	int revision;	/* svn revision of binary that saved file */

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h	2012-01-16 11:50:17 UTC (rev 43421)
@@ -47,7 +47,8 @@
 void BKE_movieclip_reload(struct MovieClip *clip);
 
 struct ImBuf *BKE_movieclip_get_ibuf(struct MovieClip *clip, struct MovieClipUser *user);
-struct ImBuf *BKE_movieclip_get_stable_ibuf(struct MovieClip *clip, struct MovieClipUser *user, float loc[2], float *scale, float *angle);
+struct ImBuf *BKE_movieclip_get_postprocessed_ibuf(struct MovieClip *clip, struct MovieClipUser *user, int postprocess_flag);
+struct ImBuf *BKE_movieclip_get_stable_ibuf(struct MovieClip *clip, struct MovieClipUser *user, float loc[2], float *scale, float *angle, int postprocess_flag);
 struct ImBuf *BKE_movieclip_get_ibuf_flag(struct MovieClip *clip, struct MovieClipUser *user, int flag);
 void BKE_movieclip_get_size(struct MovieClip *clip, struct MovieClipUser *user, int *width, int *height);
 void BKE_movieclip_aspect(struct MovieClip *clip, float *aspx, float *aspy);
@@ -63,8 +64,10 @@
 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
-#define TRACK_CLEAR_REMAINED	1
-#define TRACK_CLEAR_ALL			2
+/* postprocessing flags */
+#define MOVIECLIP_DISABLE_RED       (1<<0)
+#define MOVIECLIP_DISABLE_GREEN     (1<<1)
+#define MOVIECLIP_DISABLE_BLUE      (1<<2)
+#define MOVIECLIP_PREVIEW_GRAYSCALE (1<<3)
 
 #endif

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_tracking.h	2012-01-16 11:50:17 UTC (rev 43421)
@@ -97,6 +97,8 @@
 struct MovieTrackingReconstruction *BKE_tracking_object_reconstruction(struct MovieTracking *tracking,
 			struct MovieTrackingObject *object);
 
+void BKE_tracking_disable_imbuf_channels(struct ImBuf *ibuf, int disable_red, int disable_green, int disable_blue, int grayscale);
+
 /* clipboard */
 void BKE_tracking_free_clipboard(void);
 void BKE_tracking_clipboard_copy_tracks(struct MovieTracking *tracking, struct MovieTrackingObject *object);
@@ -166,6 +168,10 @@
 
 #define MARKER_VISIBLE(sc, marker)			(((marker)->flag&MARKER_DISABLED)==0 || ((sc)->flag&SC_HIDE_DISABLED)==0)
 
+#define TRACK_CLEAR_UPTO		0
+#define TRACK_CLEAR_REMAINED	1
+#define TRACK_CLEAR_ALL			2
+
 #define CLAMP_PAT_DIM		1
 #define CLAMP_PAT_POS		2
 #define CLAMP_SEARCH_DIM	3

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/image.c	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/image.c	2012-01-16 11:50:17 UTC (rev 43421)
@@ -1608,7 +1608,7 @@
 	return(ok);
 }
 
-/* same as BKE_write_ibuf_as but crappy workaround not to perminantly modify
+/* same as BKE_write_ibuf() but crappy workaround not to perminantly modify
  * _some_, values in the imbuf */
 int BKE_write_ibuf_as(ImBuf *ibuf, const char *name, ImageFormatData *imf,
                       const short save_copy)

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c	2012-01-16 10:48:52 UTC (rev 43420)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c	2012-01-16 11:50:17 UTC (rev 43421)
@@ -257,18 +257,30 @@
 	/* regular movie cache */
 	struct MovieCache *moviecache;
 
+	/* cached postprocessed shot */
+	struct {
+		ImBuf *ibuf;
+		int framenr;
+		int flag;
+
+		/* cache for undistorted shot */
+		float principal[2];
+		float k1, k2, k3;
+		short undistoriton_used;
+
+		int proxy;
+		short render_flag;
+	} postprocessed;
+
 	/* cache for stable shot */
-	int stable_framenr;
-	float stable_loc[2], stable_scale, stable_angle;
-	ImBuf *stableibuf;
-	int proxy;
-	short render_flag;
+	struct {
+		ImBuf *ibuf;
+		int framenr;
 
-	/* cache for undistorted shot */
-	int undist_framenr;
-	float principal[2];
-	float k1, k2, k3;
-	ImBuf *undistibuf;
+		float loc[2], scale, angle;
+		int proxy;
+		short render_flag;
+	} stabilized;
 } MovieClipCache;
 
 typedef struct MovieClipImBufCacheKey {
@@ -465,111 +477,179 @@
 	}
 }
 
-static int need_undistorted_cache(MovieClipUser *user, int flag)
+static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *distortion, ImBuf *ibuf)
 {
+	ImBuf *undistibuf;
+
+	/* XXX: because of #27997 do not use float buffers to undistort,
+	        otherwise, undistorted proxy can be darker than it should */
+	imb_freerectfloatImBuf(ibuf);
+
+	if(distortion)
+		undistibuf= BKE_tracking_distortion_exec(distortion, &clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f, 1);
+	else
+		undistibuf= BKE_tracking_undistort(&clip->tracking, ibuf, ibuf->x, ibuf->y, 0.0f);
+
+	if(undistibuf->userflags&IB_RECT_INVALID) {
+		ibuf->userflags&= ~IB_RECT_INVALID;
+		IMB_rect_from_float(undistibuf);
+	}
+
+	IMB_scaleImBuf(undistibuf, ibuf->x, ibuf->y);
+
+	return undistibuf;
+}
+
+static int need_undistortion_postprocess(MovieClipUser *user, int flag)
+{
+	int result = 0;
+
 	/* only full undistorted render can be used as on-fly undistorting image */
-	if(flag&MCLIP_USE_PROXY) {
-		if(user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL || (user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT)==0)
-			return 0;
+	if(flag & MCLIP_USE_PROXY) {
+		result |= (user->render_size == MCLIP_PROXY_RENDER_SIZE_FULL) &&
+		          (user->render_flag & MCLIP_PROXY_RENDER_UNDISTORT) != 0;
 	}
-	else return 0;
 
+	return result;
+}
+

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list