griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/makesrna/intern/rna_dynamicpaint.c
This commit is contained in:
Bastien Montagne
2018-12-09 21:51:23 +01:00
parent 879877295d d7ef1af22b
commit 168a6a4bfc
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/makesrna/intern/rna_dynamicpaint.c
View File

@@ -158,10 +158,15 @@ static void rna_DynamicPaintSurfaces_changeFormat(Main *bmain, Scene *scene, Poi
rna_DynamicPaintSurface_reset(bmain, scene, ptr);
}
static void rna_DynamicPaint_reset_dependency(Main *bmain, Scene *scene, PointerRNA *ptr)
static void rna_DynamicPaint_reset_dependency(Main *bmain, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
{
DEG_relations_tag_update(bmain);
}
static void rna_DynamicPaintSurface_reset_dependency(Main *bmain, Scene *scene, PointerRNA *ptr)
{
rna_DynamicPaintSurface_reset(bmain, scene, ptr);
DEG_relations_tag_update(bmain);
rna_DynamicPaint_reset_dependency(bmain, scene, ptr);
}
static PointerRNA rna_PaintSurface_active_get(PointerRNA *ptr)
@@ -429,7 +434,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
RNA_def_property_pointer_sdna(prop, NULL, "brush_group");
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Brush Collection", "Only use brush objects from this collection");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_DynamicPaint_reset_dependency");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_DynamicPaintSurface_reset_dependency");
/*