Commit: 6b378a869a763372e3f809c43f9bd7c6a38b2117
Author: Antony Riakiotakis
Date: Wed May 21 09:12:22 2014 +0200
https://developer.blender.org/rB6b378a869a763372e3f809c43f9bd7c6a38b2117
Merge branch 'master' into soc-2013-paint
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_internal.h
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 5476257,4ca0470..1e16a0a
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -251,15 -251,7 +251,15 @@@ void blo_do_versions_270(FileData *fd,
}
}
+ if (!MAIN_VERSION_ATLEAST(main, 270, 6)) {
+ Scene *sce;
+ for (sce = main->scene.first; sce; sce = sce->id.next) {
+ sce->toolsettings->imapaint.slot_xresolution_default =
1024;
+ sce->toolsettings->imapaint.slot_yresolution_default =
1024;
+ }
+ }
+
- if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
/* will be replaced with version check when other new flag is added to mode2 */
+ if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
Material *ma;
for (ma = main->mat.first; ma; ma = ma->id.next)
diff --cc source/blender/editors/sculpt_paint/paint_image.c
index 8a59092,d0def6b..85283d4
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@@ -754,8 -491,13 +754,8 @@@ static PaintOperation *texture_paint_in
settings->imapaint.flag |= IMAGEPAINT_DRAWING;
ED_undo_paint_push_begin(UNDO_PAINT_IMAGE, op->type->name,
- ED_image_undo_restore, ED_image_undo_free);
+ ED_image_undo_restore, ED_image_undo_free);
- {
- UnifiedPaintSettings *ups = &settings->unified_paint_settings;
- ups->stroke_active = true;
- }
-
return pop;
}
diff --cc source/blender/makesrna/intern/rna_internal.h
index 77ecc14,be27505..9a1053b
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@@ -201,9 -201,7 +201,8 @@@ void rna_def_motionpath_common(struct S
void rna_def_texmat_common(struct StructRNA *srna, const char
*texspace_editable);
void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna,
const char *begin, const char *activeget,
const char *activeset, const char *activeeditable,
const char *structname,
- const char *structname_slots, const char *update);
+ const char *structname_slots, const char *update,
const char *update_index);
+void rna_def_mtex_texpaint(struct StructRNA *srna);
-
void rna_def_render_layer_common(struct StructRNA *srna, int scene);
void rna_def_actionbone_group_common(struct StructRNA *srna, int update_flag,
const char *update_cb);
diff --cc source/blender/makesrna/intern/rna_material.c
index 9656847,3658259..88f532e
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@@ -2094,10 -2042,8 +2094,10 @@@ void RNA_def_material(BlenderRNA *brna
rna_def_animdata_common(srna);
rna_def_mtex_common(brna, srna, "rna_Material_mtex_begin",
"rna_Material_active_texture_get",
"rna_Material_active_texture_set",
"rna_Material_active_texture_editable",
- "MaterialTextureSlot", "MaterialTextureSlots",
"rna_Material_update");
+ "MaterialTextureSlot", "MaterialTextureSlots",
"rna_Material_update", "rna_Material_update");
+ rna_def_mtex_texpaint(srna);
+
/* only material has this one */
prop = RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "septex", 1);
@@@ -2183,30 -2129,7 +2183,30 @@@ void rna_def_mtex_common(BlenderRNA *br
RNA_def_property_int_sdna(prop, NULL, "texact");
RNA_def_property_range(prop, 0, MAX_MTEX - 1);
RNA_def_property_ui_text(prop, "Active Texture Index", "Index of active
texture slot");
- RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS, update);
+ RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS,
update_index);
}
+void rna_def_mtex_texpaint(StructRNA *srna)
+{
+ PropertyRNA *prop;
+
+ /* mtex */
+ prop = RNA_def_property(srna, "texture_paint_slots", PROP_COLLECTION,
PROP_NONE);
+ RNA_def_property_collection_funcs(prop, "rna_Material_texpaint_begin",
"rna_iterator_array_next", "rna_iterator_array_end",
+ "rna_iterator_array_dereference_get",
NULL, NULL, NULL, NULL);
+ RNA_def_property_struct_type(prop, "Image");
+ RNA_def_property_ui_text(prop, "Textures", "Texture slots defining the
mapping and influence of textures");
+
+ prop = RNA_def_property(srna, "paint_active_slot", PROP_INT,
PROP_UNSIGNED);
+ RNA_def_property_range(prop, 0, INT_MAX);
+ RNA_def_property_ui_text(prop, "Active Paint Texture Index", "Index of
active texture paint slot");
+ RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS,
"rna_Material_active_paint_texture_index_update");
+
+ prop = RNA_def_property(srna, "paint_clone_slot", PROP_INT,
PROP_UNSIGNED);
+ RNA_def_property_range(prop, 0, INT_MAX);
+ RNA_def_property_ui_text(prop, "Clone Paint Texture Index", "Index of
clone texture paint slot");
+ RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS, NULL);
+}
+
+
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
