[Bf-blender-cvs] [50e91b6a61f] greasepencil-object: WIP depsgraph fixes for GP and depsgraph
Joshua Leung
noreply at git.blender.org
Mon Apr 30 17:42:05 CEST 2018
Commit: 50e91b6a61fbf2d2074b2234e0b099ede7c0a9b9
Author: Joshua Leung
Date: Mon Apr 30 17:41:43 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB50e91b6a61fbf2d2074b2234e0b099ede7c0a9b9
WIP depsgraph fixes for GP and depsgraph
Still not working yet - somehow the updates aren't getting flushed yet
(perhaps COW related)
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/makesrna/intern/rna_material.c
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 68767d88bf8..2372e7bc9c7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1760,20 +1760,20 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object)
ComponentKey geometry_key(obdata, DEG_NODE_TYPE_GEOMETRY);
add_relation(time_key, geometry_key, "GP Frame Change");
-#if 0 /* GPXX */
/* Geometry cache also needs to be recalculated when Material
* settings change (e.g. when fill.opacity changes on/off,
* we need to rebuild the bGPDstroke->triangles caches)
*/
- for (short i = 0; i < gpd->totcol; i++) {
- Material *mat = gpd->mat[i];
- if ((mat) && (mat->gpcolor)) {
- ComponentKey material_key(&mat->id, DEG_NODE_TYPE_PARAMETERS);
+ for (int i = 0; i < gpd->totcol; i++) {
+ Material *ma = gpd->mat[i];
+ if ((ma) && (ma->gpcolor)) {
+ OperationKey material_key(&ma->id,
+ DEG_NODE_TYPE_SHADING,
+ DEG_OPCODE_MATERIAL_UPDATE);
add_relation(material_key, geometry_key, "Material -> GP Data");
}
}
break;
-#endif
}
}
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 52fbefdbb4a..8430d50e073 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -409,20 +409,20 @@ static void rna_def_material_greasepencil(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "rgb");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Color", "");
- RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
prop = RNA_def_property(srna, "color_rgba", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_float_sdna(prop, NULL, "rgb");
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Color Rgba", "");
- RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
prop = RNA_def_property(srna, "alpha", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "rgb[3]");
RNA_def_property_range(prop, 0.0, 1.0f);
RNA_def_property_ui_text(prop, "Opacity", "Color Opacity");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Fill Drawing Color */
prop = RNA_def_property(srna, "fill_color", PROP_FLOAT, PROP_COLOR_GAMMA);
@@ -430,21 +430,21 @@ static void rna_def_material_greasepencil(BlenderRNA *brna)
RNA_def_property_array(prop, 3);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Fill Color", "Color for filling region bounded by each stroke");
- RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
prop = RNA_def_property(srna, "fill_rgba", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "fill");
RNA_def_property_array(prop, 4);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Fill Color Rgba", "Color for filling region bounded by each stroke");
- RNA_def_property_update(prop, NC_SCREEN | NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Fill alpha */
prop = RNA_def_property(srna, "fill_alpha", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "fill[3]");
RNA_def_property_range(prop, 0.0, 1.0f);
RNA_def_property_ui_text(prop, "Fill Opacity", "Opacity for filling region bounded by each stroke");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Secondary Drawing Color */
prop = RNA_def_property(srna, "mix_color", PROP_FLOAT, PROP_COLOR_GAMMA);
@@ -452,141 +452,141 @@ static void rna_def_material_greasepencil(BlenderRNA *brna)
RNA_def_property_array(prop, 4);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Mix Color", "Color for mixing with primary filling color");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Mix factor */
prop = RNA_def_property(srna, "mix_factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "mix_factor");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Mix", "Mix Adjustment Factor");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Scale factor for uv coordinates */
prop = RNA_def_property(srna, "pattern_scale", PROP_FLOAT, PROP_COORDS);
RNA_def_property_float_sdna(prop, NULL, "g_scale");
RNA_def_property_array(prop, 2);
RNA_def_property_ui_text(prop, "Scale", "Scale Factor for UV coordinates");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Shift factor to move pattern filling in 2d space */
prop = RNA_def_property(srna, "pattern_shift", PROP_FLOAT, PROP_COORDS);
RNA_def_property_float_sdna(prop, NULL, "g_shift");
RNA_def_property_array(prop, 2);
RNA_def_property_ui_text(prop, "Shift", "Shift filling pattern in 2d space");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Gradient angle */
prop = RNA_def_property(srna, "pattern_angle", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_sdna(prop, NULL, "g_angle");
RNA_def_property_ui_text(prop, "Angle", "Pattern Orientation Angle");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Gradient radius */
prop = RNA_def_property(srna, "pattern_radius", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "g_radius");
RNA_def_property_range(prop, 0.0001f, 10.0f);
RNA_def_property_ui_text(prop, "Radius", "Pattern Radius");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Box size */
prop = RNA_def_property(srna, "pattern_boxsize", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "g_boxsize");
RNA_def_property_range(prop, 0.0001f, 10.0f);
RNA_def_property_ui_text(prop, "Size", "Box Size");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Texture angle */
prop = RNA_def_property(srna, "texture_angle", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_sdna(prop, NULL, "t_angle");
RNA_def_property_ui_text(prop, "Angle", "Texture Orientation Angle");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Scale factor for texture */
prop = RNA_def_property(srna, "texture_scale", PROP_FLOAT, PROP_COORDS);
RNA_def_property_float_sdna(prop, NULL, "t_scale");
RNA_def_property_array(prop, 2);
RNA_def_property_ui_text(prop, "Scale", "Scale Factor for Texture");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Shift factor to move texture in 2d space */
prop = RNA_def_property(srna, "texture_offset", PROP_FLOAT, PROP_COORDS);
RNA_def_property_float_sdna(prop, NULL, "t_offset");
RNA_def_property_array(prop, 2);
RNA_def_property_ui_text(prop, "Offset", "Shift Texture in 2d Space");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* Texture opacity size */
prop = RNA_def_property(srna, "texture_opacity", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "t_opacity");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Opacity", "Texture Opacity");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_Material_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_Material_update");
/* texture pixsize factor (used for UV along the stroke) */
prop = RNA_def_property(srna, "pixel_size", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "t_pixsize");
RNA_def_property_range(prop, 1, 5000);
RNA_def_property_ui_text(prop, "UV Factor", "Texture Pixel Size factor along the stroke");
- RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS | ND_DATA | NC_GPENCIL, "rna_gpcolordata_uv_update");
+ RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_gpcolordata_uv_update");
/* Flags */
prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GPC_COLOR_HIDE);
RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1);
RNA_def_pr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list