[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25517] trunk/blender: clone and stencil layer access added, renamed mask to stencil layer internally
Campbell Barton
ideasman42 at gmail.com
Tue Dec 22 11:48:13 CET 2009
Revision: 25517
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25517
Author: campbellbarton
Date: 2009-12-22 11:48:13 +0100 (Tue, 22 Dec 2009)
Log Message:
-----------
clone and stencil layer access added, renamed mask to stencil layer internally
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-12-22 10:14:13 UTC (rev 25516)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-12-22 10:48:13 UTC (rev 25517)
@@ -826,25 +826,52 @@
col.active = (ipaint.use_normal_falloff and use_projection)
col.prop(ipaint, "normal_angle", text="")
- split = layout.split(percentage=0.7)
+ col = layout.column(align=False)
+ row = col.row()
+ row.active = (use_projection)
+ row.prop(ipaint, "use_stencil_layer", text="Stencil")
- col = split.column(align=False)
- col.active = (use_projection)
- col.prop(ipaint, "use_stencil_layer")
+ row2 = row.row(align=False)
+ row2.active = (use_projection and ipaint.use_stencil_layer)
+ row2.menu("VIEW3D_MT_tools_projectpaint_stencil", text=context.active_object.data.uv_texture_stencil.name)
+ row2.prop(ipaint, "invert_stencil", text="", icon='IMAGE_ALPHA')
- col = split.column(align=False)
- col.active = (use_projection and ipaint.use_stencil_layer)
- col.prop(ipaint, "invert_stencil", text="Inv")
-
col = layout.column()
sub = col.column()
- sub.active = (settings.tool == 'CLONE')
- sub.prop(ipaint, "use_clone_layer")
+ row = sub.row()
+ row.active = (settings.tool == 'CLONE')
+
+ row.prop(ipaint, "use_clone_layer", text="Clone")
+ row.menu("VIEW3D_MT_tools_projectpaint_clone", text=context.active_object.data.uv_texture_clone.name)
sub = col.column()
sub.prop(ipaint, "seam_bleed")
+ class VIEW3D_MT_tools_projectpaint_clone(bpy.types.Menu):
+ bl_label = "Clone Layer"
+ def draw(self, context):
+ layout = self.layout
+ for i, tex in enumerate(context.active_object.data.uv_textures):
+ prop = layout.operator("wm.context_set_int", text=tex.name)
+ prop.path = "active_object.data.uv_texture_clone_index"
+ prop.value = i
+
+
+ class VIEW3D_MT_tools_projectpaint_stencil(bpy.types.Menu):
+ bl_label = "Mask Layer"
+
+ def draw(self, context):
+ layout = self.layout
+ for i, tex in enumerate(context.active_object.data.uv_textures):
+ prop = layout.operator("wm.context_set_int", text=tex.name)
+ prop.path = "active_object.data.uv_texture_stencil_index"
+ prop.value = i
+
+ bpy.types.register(VIEW3D_MT_tools_projectpaint_clone)
+ bpy.types.register(VIEW3D_MT_tools_projectpaint_stencil)
+
+
class VIEW3D_PT_tools_particlemode(View3DPanel):
'''default tools for particle mode'''
bl_context = "particlemode"
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2009-12-22 10:14:13 UTC (rev 25516)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2009-12-22 10:48:13 UTC (rev 25517)
@@ -198,11 +198,11 @@
int CustomData_get_active_layer_index(const struct CustomData *data, int type);
int CustomData_get_render_layer_index(const struct CustomData *data, int type);
int CustomData_get_clone_layer_index(const struct CustomData *data, int type);
-int CustomData_get_mask_layer_index(const struct CustomData *data, int type);
+int CustomData_get_stencil_layer_index(const struct CustomData *data, int type);
int CustomData_get_active_layer(const struct CustomData *data, int type);
int CustomData_get_render_layer(const struct CustomData *data, int type);
int CustomData_get_clone_layer(const struct CustomData *data, int type);
-int CustomData_get_mask_layer(const struct CustomData *data, int type);
+int CustomData_get_stencil_layer(const struct CustomData *data, int type);
/* copies the data from source to the data element at index in the first
* layer of type
@@ -237,7 +237,7 @@
void CustomData_set_layer_active_index(struct CustomData *data, int type, int n);
void CustomData_set_layer_render_index(struct CustomData *data, int type, int n);
void CustomData_set_layer_clone_index(struct CustomData *data, int type, int n);
-void CustomData_set_layer_mask_index(struct CustomData *data, int type, int n);
+void CustomData_set_layer_stencil_index(struct CustomData *data, int type, int n);
/* adds flag to the layer flags */
void CustomData_set_layer_flag(struct CustomData *data, int type, int flag);
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2009-12-22 10:14:13 UTC (rev 25516)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2009-12-22 10:48:13 UTC (rev 25517)
@@ -1006,7 +1006,7 @@
return -1;
}
-int CustomData_get_mask_layer_index(const CustomData *data, int type)
+int CustomData_get_stencil_layer_index(const CustomData *data, int type)
{
int i;
@@ -1050,7 +1050,7 @@
return -1;
}
-int CustomData_get_mask_layer(const CustomData *data, int type)
+int CustomData_get_stencil_layer(const CustomData *data, int type)
{
int i;
@@ -1125,7 +1125,7 @@
data->layers[i].active_clone = n-i;
}
-void CustomData_set_layer_mask_index(CustomData *data, int type, int n)
+void CustomData_set_layer_stencil_index(CustomData *data, int type, int n)
{
int i;
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-12-22 10:14:13 UTC (rev 25516)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-12-22 10:48:13 UTC (rev 25517)
@@ -87,7 +87,7 @@
actlayerdata = data->layers[CustomData_get_active_layer_index(data, type)].data;
rndlayerdata = data->layers[CustomData_get_render_layer_index(data, type)].data;
clonelayerdata = data->layers[CustomData_get_clone_layer_index(data, type)].data;
- masklayerdata = data->layers[CustomData_get_mask_layer_index(data, type)].data;
+ masklayerdata = data->layers[CustomData_get_stencil_layer_index(data, type)].data;
CustomData_set_layer_active(data, type, layer - &data->layers[index]);
if(me->edit_mesh) {
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2009-12-22 10:14:13 UTC (rev 25516)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2009-12-22 10:48:13 UTC (rev 25517)
@@ -2864,8 +2864,8 @@
}
if (ps->do_layer_mask) {
- //int layer_num = CustomData_get_mask_layer(&ps->dm->faceData, CD_MTFACE);
- int layer_num = CustomData_get_mask_layer(&((Mesh *)ps->ob->data)->fdata, CD_MTFACE);
+ //int layer_num = CustomData_get_stencil_layer(&ps->dm->faceData, CD_MTFACE);
+ int layer_num = CustomData_get_stencil_layer(&((Mesh *)ps->ob->data)->fdata, CD_MTFACE);
if (layer_num != -1)
ps->dm_mtface_mask = CustomData_get_layer_n(&ps->dm->faceData, CD_MTFACE, layer_num);
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2009-12-22 10:14:13 UTC (rev 25516)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2009-12-22 10:48:13 UTC (rev 25517)
@@ -330,7 +330,7 @@
return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFaceLayer, cdl);
}
-static PointerRNA rna_Mesh_clone_uv_texture_get(PointerRNA *ptr)
+static PointerRNA rna_Mesh_uv_texture_clone_get(PointerRNA *ptr)
{
Mesh *me= (Mesh*)ptr->data;
CustomData *fdata= rna_mesh_fdata(me);
@@ -340,6 +340,16 @@
return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFaceLayer, cdl);
}
+static PointerRNA rna_Mesh_uv_texture_stencil_get(PointerRNA *ptr)
+{
+ Mesh *me= (Mesh*)ptr->data;
+ CustomData *fdata= rna_mesh_fdata(me);
+ int index= CustomData_get_stencil_layer_index(fdata, CD_MTFACE);
+ CustomDataLayer *cdl= (index == -1)? NULL: &fdata->layers[index];
+
+ return rna_pointer_inherit_refine(ptr, &RNA_MeshTextureFaceLayer, cdl);
+}
+
static void rna_Mesh_active_uv_texture_set(PointerRNA *ptr, PointerRNA value)
{
Mesh *me= (Mesh*)ptr->data;
@@ -356,7 +366,7 @@
}
}
-static void rna_Mesh_clone_uv_texture_set(PointerRNA *ptr, PointerRNA value)
+static void rna_Mesh_uv_texture_clone_set(PointerRNA *ptr, PointerRNA value)
{
Mesh *me= (Mesh*)ptr->data;
CustomData *fdata= rna_mesh_fdata(me);
@@ -366,12 +376,26 @@
for(cdl=fdata->layers, a=0; a<fdata->totlayer; cdl++, a++) {
if(value.data == cdl) {
CustomData_set_layer_clone_index(fdata, CD_MTFACE, a);
- mesh_update_customdata_pointers(me);
return;
}
}
}
+static void rna_Mesh_uv_texture_stencil_set(PointerRNA *ptr, PointerRNA value)
+{
+ Mesh *me= (Mesh*)ptr->data;
+ CustomData *fdata= rna_mesh_fdata(me);
+ CustomDataLayer *cdl;
+ int a;
+
+ for(cdl=fdata->layers, a=0; a<fdata->totlayer; cdl++, a++) {
+ if(value.data == cdl) {
+ CustomData_set_layer_stencil_index(fdata, CD_MTFACE, a);
+ return;
+ }
+ }
+}
+
static int rna_Mesh_active_uv_texture_index_get(PointerRNA *ptr)
{
Mesh *me= (Mesh*)ptr->data;
@@ -379,13 +403,20 @@
return CustomData_get_active_layer(fdata, CD_MTFACE);
}
-static int rna_Mesh_clone_uv_texture_index_get(PointerRNA *ptr)
+static int rna_Mesh_uv_texture_clone_index_get(PointerRNA *ptr)
{
Mesh *me= (Mesh*)ptr->data;
CustomData *fdata= rna_mesh_fdata(me);
return CustomData_get_clone_layer(fdata, CD_MTFACE);
}
+static int rna_Mesh_uv_texture_stencil_index_get(PointerRNA *ptr)
+{
+ Mesh *me= (Mesh*)ptr->data;
+ CustomData *fdata= rna_mesh_fdata(me);
+ return CustomData_get_stencil_layer(fdata, CD_MTFACE);
+}
+
static void rna_Mesh_active_uv_texture_index_set(PointerRNA *ptr, int value)
{
Mesh *me= (Mesh*)ptr->data;
@@ -395,15 +426,22 @@
mesh_update_customdata_pointers(me);
}
-static void rna_Mesh_clone_uv_texture_index_set(PointerRNA *ptr, int value)
+static void rna_Mesh_uv_texture_clone_index_set(PointerRNA *ptr, int value)
{
Mesh *me= (Mesh*)ptr->data;
CustomData *fdata= rna_mesh_fdata(me);
CustomData_set_layer_clone(fdata, CD_MTFACE, value);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list