[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50246] branches/soc-2012-fried_chicken: Merge with trunk r50245 + fixed issues caused by previous (failed?) merge.
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Mon Aug 27 12:59:16 CEST 2012
Revision: 50246
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50246
Author: miikah
Date: 2012-08-27 10:59:15 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Merge with trunk r50245 + fixed issues caused by previous (failed?) merge.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50245
Modified Paths:
--------------
branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-fried_chicken/source/blender/blenkernel/CMakeLists.txt
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/sound.c
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_math_vector.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_pbvh.h
branches/soc-2012-fried_chicken/source/blender/blenlib/BLI_string.h
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/math_vector.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/pbvh.c
branches/soc-2012-fried_chicken/source/blender/blenlib/intern/string.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/readfile.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2012-fried_chicken/source/blender/blenloader/intern/writefile.c
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_error.h
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_mods.h
branches/soc-2012-fried_chicken/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2012-fried_chicken/source/blender/collada/AnimationExporter.h
branches/soc-2012-fried_chicken/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-fried_chicken/source/blender/collada/TransformReader.h
branches/soc-2012-fried_chicken/source/blender/collada/collada_internal.h
branches/soc-2012-fried_chicken/source/blender/editors/animation/keyframes_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/io/io_collada.c
branches/soc-2012-fried_chicken/source/blender/editors/mask/mask_draw.c
branches/soc-2012-fried_chicken/source/blender/editors/object/object_group.c
branches/soc-2012-fried_chicken/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-fried_chicken/source/blender/editors/space_file/space_file.c
branches/soc-2012-fried_chicken/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-fried_chicken/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2012-fried_chicken/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_imbuf.h
branches/soc-2012-fried_chicken/source/blender/imbuf/IMB_thumbs.h
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/anim_movie.c
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2012-fried_chicken/source/blender/imbuf/intern/util.c
branches/soc-2012-fried_chicken/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-fried_chicken/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2012-fried_chicken/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_types_select.c
branches/soc-2012-fried_chicken/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2012-fried_chicken/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2012-fried_chicken/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2012-fried_chicken/source/blender/render/intern/include/rayobject.h
branches/soc-2012-fried_chicken/source/blender/windowmanager/WM_api.h
branches/soc-2012-fried_chicken/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-fried_chicken/source/creator/creator.c
branches/soc-2012-fried_chicken/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2012-fried_chicken/source/gameengine/Expressions/BoolValue.cpp
branches/soc-2012-fried_chicken/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2012-fried_chicken/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2012-fried_chicken/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Added Paths:
-----------
branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask_evaluate.c
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DespeckleNode.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/nodes/COM_DespeckleNode.h
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DespeckleOperation.cpp
branches/soc-2012-fried_chicken/source/blender/compositor/operations/COM_DespeckleOperation.h
branches/soc-2012-fried_chicken/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2012-fried_chicken/source/blender/nodes/composite/nodes/node_composite_despeckle.c
Property Changed:
----------------
branches/soc-2012-fried_chicken/
branches/soc-2012-fried_chicken/source/blender/editors/interface/interface.c
branches/soc-2012-fried_chicken/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-fried_chicken
___________________________________________________________________
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/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46807-50211
+ /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/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:46807-50245
Modified: branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
--- branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_mask_common.py 2012-08-27 09:46:49 UTC (rev 50245)
+++ branches/soc-2012-fried_chicken/release/scripts/startup/bl_ui/properties_mask_common.py 2012-08-27 10:59:15 UTC (rev 50246)
@@ -121,6 +121,7 @@
spline = mask.layers.active.splines.active
col = layout.column()
+ col.prop(spline, "offset_mode")
col.prop(spline, "weight_interpolation")
row = col.row()
Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mask.h 2012-08-27 09:46:49 UTC (rev 50245)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/BKE_mask.h 2012-08-27 10:59:15 UTC (rev 50246)
@@ -19,7 +19,8 @@
* All rights reserved.
*
* Contributor(s): Blender Foundation,
- * Sergey Sharybin
+ * Sergey Sharybin,
+ * Campbell Barton
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -63,29 +64,12 @@
/* splines */
struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
-
-unsigned int BKE_mask_spline_resolution(struct MaskSpline *spline, int width, int height);
-unsigned int BKE_mask_spline_feather_resolution(struct MaskSpline *spline, int width, int height);
-
-int BKE_mask_spline_differentiate_calc_total(const struct MaskSpline *spline, const unsigned int resol);
-
-float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int *tot_diff_point))[2];
-float (*BKE_mask_spline_feather_differentiated_points(struct MaskSpline *spline, int *tot_feather_point))[2];
-
-float (*BKE_mask_spline_differentiate_with_resolution_ex(struct MaskSpline *spline, int *tot_diff_point,
- const unsigned int resol))[2];
-void BKE_mask_spline_feather_collapse_inner_loops(struct MaskSpline *spline, float (*feather_points)[2], const int tot_feather_point);
-float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline *spline, int width, int height, int *tot_diff_point))[2];
-float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(struct MaskSpline *spline, int *tot_feather_point,
- const unsigned int resol, const int do_feather_isect))[2];
-float (*BKE_mask_spline_feather_differentiated_points_with_resolution(struct MaskSpline *spline, int width, int height,
- int *tot_feather_point, const int do_feather_isect))[2];
-
-float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feather_point))[2];
-
void BKE_mask_point_direction_switch(struct MaskSplinePoint *point);
void BKE_mask_spline_direction_switch(struct MaskLayer *masklay, struct MaskSpline *spline);
+struct BezTriple *BKE_mask_spline_point_next_bezt(struct MaskSpline *spline, struct MaskSplinePoint *points_array,
+ struct MaskSplinePoint *point);
+
typedef enum {
MASK_PROJ_NEG = -1,
MASK_PROJ_ANY = 0,
@@ -100,19 +84,6 @@
void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2], int keep_direction,
float orig_handle[2], float orig_vec[3][3]);
-float *BKE_mask_point_segment_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
- unsigned int *tot_diff_point);
-float *BKE_mask_point_segment_feather_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
- unsigned int *tot_feather_point);
-
-float *BKE_mask_point_segment_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point,
- int width, int height,
- unsigned int *tot_diff_point);
-
-float *BKE_mask_point_segment_feather_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point,
- int width, int height,
- unsigned int *tot_feather_point);
-
void BKE_mask_point_segment_co(struct MaskSpline *spline, struct MaskSplinePoint *point, float u, float co[2]);
void BKE_mask_point_normal(struct MaskSpline *spline, struct MaskSplinePoint *point,
float u, float n[2]);
@@ -205,6 +176,39 @@
#define MASK_RESOL_MAX 128
+
+/* mask_evaluate.c */
+unsigned int BKE_mask_spline_resolution(struct MaskSpline *spline, int width, int height);
+unsigned int BKE_mask_spline_feather_resolution(struct MaskSpline *spline, int width, int height);
+int BKE_mask_spline_differentiate_calc_total(const struct MaskSpline *spline, const unsigned int resol);
+
+float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int *tot_diff_point))[2];
+float (*BKE_mask_spline_feather_differentiated_points(struct MaskSpline *spline, int *tot_feather_point))[2];
+
+float (*BKE_mask_spline_differentiate_with_resolution_ex(struct MaskSpline *spline, int *tot_diff_point,
+ const unsigned int resol))[2];
+void BKE_mask_spline_feather_collapse_inner_loops(struct MaskSpline *spline, float (*feather_points)[2], const int tot_feather_point);
+float (*BKE_mask_spline_differentiate_with_resolution(struct MaskSpline *spline, int width, int height, int *tot_diff_point))[2];
+float (*BKE_mask_spline_feather_differentiated_points_with_resolution_ex(struct MaskSpline *spline, int *tot_feather_point,
+ const unsigned int resol, const int do_feather_isect))[2];
+float (*BKE_mask_spline_feather_differentiated_points_with_resolution(struct MaskSpline *spline, int width, int height,
+ int *tot_feather_point, const int do_feather_isect))[2];
+/* *** mask point functions which involve evaluation *** */
+float (*BKE_mask_spline_feather_points(struct MaskSpline *spline, int *tot_feather_point))[2];
+
+float *BKE_mask_point_segment_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
+ unsigned int *tot_diff_point);
+float *BKE_mask_point_segment_feather_diff(struct MaskSpline *spline, struct MaskSplinePoint *point,
+ unsigned int *tot_feather_point);
+
+float *BKE_mask_point_segment_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point,
+ int width, int height,
+ unsigned int *tot_diff_point);
+
+float *BKE_mask_point_segment_feather_diff_with_resolution(struct MaskSpline *spline, struct MaskSplinePoint *point,
+ int width, int height,
+ unsigned int *tot_feather_point);
+
/* mask_rasterize.c */
struct MaskRasterHandle;
typedef struct MaskRasterHandle MaskRasterHandle;
Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/CMakeLists.txt 2012-08-27 09:46:49 UTC (rev 50245)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/CMakeLists.txt 2012-08-27 10:59:15 UTC (rev 50246)
@@ -101,6 +101,7 @@
intern/lamp.c
intern/lattice.c
intern/library.c
+ intern/mask_evaluate.c
intern/mask_rasterize.c
intern/mask.c
intern/material.c
Modified: branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c 2012-08-27 09:46:49 UTC (rev 50245)
+++ branches/soc-2012-fried_chicken/source/blender/blenkernel/intern/mask.c 2012-08-27 10:59:15 UTC (rev 50246)
@@ -19,7 +19,8 @@
* All rights reserved.
*
* Contributor(s): Blender Foundation,
- * Sergey Sharybin
+ * Sergey Sharybin,
+ * Campbell Barton
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -41,12 +42,8 @@
#include "DNA_mask_types.h"
#include "DNA_node_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_object_types.h"
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
-#include "DNA_movieclip_types.h"
-#include "DNA_tracking_types.h"
#include "DNA_sequence_types.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list