[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47293] branches/soc-2011-tomato: rename mask-objects to mask-layers.
Campbell Barton
ideasman42 at gmail.com
Thu May 31 21:12:22 CEST 2012
Revision: 47293
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47293
Author: campbellbarton
Date: 2012-05-31 19:12:22 +0000 (Thu, 31 May 2012)
Log Message:
-----------
rename mask-objects to mask-layers.
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mask.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_intern.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_select.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-05-31 19:09:23 UTC (rev 47292)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-05-31 19:12:22 UTC (rev 47293)
@@ -565,7 +565,7 @@
class CLIP_PT_mask_objects(Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'UI'
- bl_label = "Mask Objects"
+ bl_label = "Mask Layers"
@classmethod
def poll(cls, context):
@@ -580,15 +580,15 @@
mask = sc.mask
row = layout.row()
- row.template_list(mask, "objects",
- mask, "active_object_index", rows=3)
+ row.template_list(mask, "layers",
+ mask, "active_layer_index", rows=3)
sub = row.column(align=True)
- sub.operator("mask.object_new", icon='ZOOMIN', text="")
- sub.operator("mask.object_remove", icon='ZOOMOUT', text="")
+ sub.operator("mask.layer_new", icon='ZOOMIN', text="")
+ sub.operator("mask.layer_remove", icon='ZOOMOUT', text="")
- active = mask.objects.active
+ active = mask.layers.active
if active:
layout.prop(active, "name")
@@ -611,7 +611,7 @@
mask = sc.mask
if mask and sc.mode == 'MASKEDITING':
- return mask.objects.active and mask.objects.active.splines.active
+ return mask.layers.active and mask.layers.active.splines.active
return False
@@ -620,7 +620,7 @@
sc = context.space_data
mask = sc.mask
- spline = mask.objects.active.splines.active
+ spline = mask.layers.active.splines.active
col = layout.column()
col.prop(spline, "weight_interpolation")
@@ -638,7 +638,7 @@
mask = sc.mask
if mask and sc.mode == 'MASKEDITING':
- return mask.objects.active and mask.objects.active.splines.active_point
+ return mask.layers.active and mask.layers.active.splines.active_point
return False
@@ -647,7 +647,7 @@
sc = context.space_data
mask = sc.mask
- point = mask.objects.active.splines.active_point
+ point = mask.layers.active.splines.active_point
parent = point.parent
col = layout.column()
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2012-05-31 19:09:23 UTC (rev 47292)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2012-05-31 19:12:22 UTC (rev 47293)
@@ -30,8 +30,8 @@
struct Main;
struct Mask;
struct MaskParent;
-struct MaskObject;
-struct MaskObjectShape;
+struct MaskLayer;
+struct MaskLayerShape;
struct MaskSpline;
struct MaskSplinePoint;
struct MaskSplinePointUW;
@@ -42,20 +42,20 @@
struct MaskSplinePoint *BKE_mask_spline_point_array(struct MaskSpline *spline);
struct MaskSplinePoint *BKE_mask_spline_point_array_from_point(struct MaskSpline *spline, struct MaskSplinePoint *point_ref);
-/* mask objects */
-struct MaskObject *BKE_mask_object_new(struct Mask *mask, const char *name);
-struct MaskObject *BKE_mask_object_active(struct Mask *mask);
-void BKE_mask_object_active_set(struct Mask *mask, struct MaskObject *maskobj);
-void BKE_mask_object_remove(struct Mask *mask, struct MaskObject *maskobj);
+/* mask layers */
+struct MaskLayer *BKE_mask_layer_new(struct Mask *mask, const char *name);
+struct MaskLayer *BKE_mask_layer_active(struct Mask *mask);
+void BKE_mask_layer_active_set(struct Mask *mask, struct MaskLayer *masklay);
+void BKE_mask_layer_remove(struct Mask *mask, struct MaskLayer *masklay);
-void BKE_mask_object_free(struct MaskObject *maskobj);
+void BKE_mask_layer_free(struct MaskLayer *masklay);
void BKE_mask_spline_free(struct MaskSpline *spline);
void BKE_mask_point_free(struct MaskSplinePoint *point);
-void BKE_mask_object_unique_name(struct Mask *mask, struct MaskObject *maskobj);
+void BKE_mask_layer_unique_name(struct Mask *mask, struct MaskLayer *masklay);
/* splines */
-struct MaskSpline *BKE_mask_spline_add(struct MaskObject *maskobj);
+struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
int BKE_mask_spline_resolution(struct MaskSpline *spline, float max_seg_len);
float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int *tot_diff_point, int dynamic_res, float max_dseg_len))[2];
@@ -107,31 +107,31 @@
void BKE_mask_spline_ensure_deform(struct MaskSpline *spline);
/* animation */
-int BKE_mask_object_shape_totvert(struct MaskObject *maskobj);
-void BKE_mask_object_shape_from_mask(struct MaskObject *maskobj, struct MaskObjectShape *maskobj_shape);
-void BKE_mask_object_shape_to_mask(struct MaskObject *maskobj, struct MaskObjectShape *maskobj_shape);
-void BKE_mask_object_shape_to_mask_interp(struct MaskObject *maskobj,
- struct MaskObjectShape *maskobj_shape_a,
- struct MaskObjectShape *maskobj_shape_b,
+int BKE_mask_layer_shape_totvert(struct MaskLayer *masklay);
+void BKE_mask_layer_shape_from_mask(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_to_mask(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_to_mask_interp(struct MaskLayer *masklay,
+ struct MaskLayerShape *masklay_shape_a,
+ struct MaskLayerShape *masklay_shape_b,
const float fac);
-struct MaskObjectShape *BKE_mask_object_shape_find_frame(struct MaskObject *maskobj, int frame);
-int BKE_mask_object_shape_find_frame_range(struct MaskObject *maskobj, int frame,
- struct MaskObjectShape **r_maskobj_shape_a,
- struct MaskObjectShape **r_maskobj_shape_b);
-struct MaskObjectShape *BKE_mask_object_shape_varify_frame(struct MaskObject *maskobj, int frame);
-void BKE_mask_object_shape_unlink(struct MaskObject *maskobj, struct MaskObjectShape *maskobj_shape);
-void BKE_mask_object_shape_sort(struct MaskObject *maskobj);
+struct MaskLayerShape *BKE_mask_layer_shape_find_frame(struct MaskLayer *masklay, int frame);
+int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, int frame,
+ struct MaskLayerShape **r_masklay_shape_a,
+ struct MaskLayerShape **r_masklay_shape_b);
+struct MaskLayerShape *BKE_mask_layer_shape_varify_frame(struct MaskLayer *masklay, int frame);
+void BKE_mask_layer_shape_unlink(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
+void BKE_mask_layer_shape_sort(struct MaskLayer *masklay);
-int BKE_mask_object_shape_spline_from_index(struct MaskObject *maskobj, int index,
- struct MaskSpline **r_maskobj_shape, int *r_index);
-int BKE_mask_object_shape_spline_to_index(struct MaskObject *maskobj, struct MaskSpline *spline);
+int BKE_mask_layer_shape_spline_from_index(struct MaskLayer *masklay, int index,
+ struct MaskSpline **r_masklay_shape, int *r_index);
+int BKE_mask_layer_shape_spline_to_index(struct MaskLayer *masklay, struct MaskSpline *spline);
-int BKE_mask_object_shape_spline_index(struct MaskObject *maskobj, int index,
- struct MaskSpline **r_maskobj_shape, int *r_index);
-void BKE_mask_object_shape_changed_add(struct MaskObject *maskobj, int index,
+int BKE_mask_layer_shape_spline_index(struct MaskLayer *masklay, int index,
+ struct MaskSpline **r_masklay_shape, int *r_index);
+void BKE_mask_layer_shape_changed_add(struct MaskLayer *masklay, int index,
int do_init, int do_init_interpolate);
-void BKE_mask_object_shape_changed_remove(struct MaskObject *maskobj, int index, int count);
+void BKE_mask_layer_shape_changed_remove(struct MaskLayer *masklay, int index, int count);
/* rasterization */
void BKE_mask_rasterize(struct Mask *mask, int width, int height, float *buffer);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-05-31 19:09:23 UTC (rev 47292)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-05-31 19:12:22 UTC (rev 47293)
@@ -77,63 +77,63 @@
return NULL;
}
-/* mask objects */
+/* mask layers */
-MaskObject *BKE_mask_object_new(Mask *mask, const char *name)
+MaskLayer *BKE_mask_layer_new(Mask *mask, const char *name)
{
- MaskObject *maskobj = MEM_callocN(sizeof(MaskObject), "new mask object");
+ MaskLayer *masklay = MEM_callocN(sizeof(MaskLayer), __func__);
if (name && name[0])
- BLI_strncpy(maskobj->name, name, sizeof(maskobj->name));
+ BLI_strncpy(masklay->name, name, sizeof(masklay->name));
else
- strcpy(maskobj->name, "MaskObject");
+ strcpy(masklay->name, "MaskLayer");
- BLI_addtail(&mask->maskobjs, maskobj);
+ BLI_addtail(&mask->masklayers, masklay);
- BKE_mask_object_unique_name(mask, maskobj);
+ BKE_mask_layer_unique_name(mask, masklay);
- mask->tot_maskobj++;
+ mask->masklay_tot++;
- maskobj->alpha = 1.0f;
+ masklay->alpha = 1.0f;
- return maskobj;
+ return masklay;
}
/* note: may still be hidden, caller needs to check */
-MaskObject *BKE_mask_object_active(Mask *mask)
+MaskLayer *BKE_mask_layer_active(Mask *mask)
{
- return BLI_findlink(&mask->maskobjs, mask->act_maskobj);
+ return BLI_findlink(&mask->masklayers, mask->masklay_act);
}
-void BKE_mask_object_active_set(Mask *mask, MaskObject *maskobj)
+void BKE_mask_layer_active_set(Mask *mask, MaskLayer *masklay)
{
- mask->act_maskobj = BLI_findindex(&mask->maskobjs, maskobj);
+ mask->masklay_act = BLI_findindex(&mask->masklayers, masklay);
}
-void BKE_mask_object_remove(Mask *mask, MaskObject *maskobj)
+void BKE_mask_layer_remove(Mask *mask, MaskLayer *masklay)
{
- BLI_remlink(&mask->maskobjs, maskobj);
- BKE_mask_object_free(maskobj);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list