Commit: 168a6a4bfc13cbe5c2fb510607b9565de3eb9472
Author: Bastien Montagne
Date:   Sun Dec 9 21:51:23 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB168a6a4bfc13cbe5c2fb510607b9565de3eb9472

Merge branch 'master' into blender2.8

Conflicts:
        source/blender/makesrna/intern/rna_dynamicpaint.c

===================================================================



===================================================================

diff --cc source/blender/makesrna/intern/rna_dynamicpaint.c
index 542d0c35e2c,2561c9606b2..c15740305a8
--- a/source/blender/makesrna/intern/rna_dynamicpaint.c
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.c
@@@ -158,12 -157,17 +158,17 @@@ static void rna_DynamicPaintSurfaces_ch
        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))
  {
-       rna_DynamicPaintSurface_reset(bmain, scene, ptr);
 -      DAG_relations_tag_update(bmain);
 +      DEG_relations_tag_update(bmain);
  }
  
+ static void rna_DynamicPaintSurface_reset_dependency(Main *bmain, Scene 
*scene, PointerRNA *ptr)
+ {
+       rna_DynamicPaintSurface_reset(bmain, scene, ptr);
+       rna_DynamicPaint_reset_dependency(bmain, scene, ptr);
+ }
+ 
  static PointerRNA rna_PaintSurface_active_get(PointerRNA *ptr)
  {
        DynamicPaintCanvasSettings *canvas = (DynamicPaintCanvasSettings 
*)ptr->data;
@@@ -424,12 -428,11 +429,12 @@@ static void rna_def_canvas_surface(Blen
        RNA_def_property_update(prop, NC_OBJECT, 
"rna_DynamicPaintSurface_uniqueName");
        RNA_def_struct_name_property(srna, prop);
  
 -      prop = RNA_def_property(srna, "brush_group", PROP_POINTER, PROP_NONE);
 -      RNA_def_property_struct_type(prop, "Group");
 +      prop = RNA_def_property(srna, "brush_collection", PROP_POINTER, 
PROP_NONE);
 +      RNA_def_property_struct_type(prop, "Collection");
 +      RNA_def_property_pointer_sdna(prop, NULL, "brush_group");
        RNA_def_property_flag(prop, PROP_EDITABLE);
 -      RNA_def_property_ui_text(prop, "Brush Group", "Only use brush objects 
from this group");
 +      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");
  
  
        /*

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to