[Bf-blender-cvs] [1df1337dcbb] sculpt-mode-features: Merge branch 'master' into sculpt-mode-features

Pablo Dobarro noreply at git.blender.org
Sun Mar 24 04:03:06 CET 2019


Commit: 1df1337dcbbd4643ec984ff15bb9271eeafa9516
Author: Pablo Dobarro
Date:   Sun Mar 24 04:02:07 2019 +0100
Branches: sculpt-mode-features
https://developer.blender.org/rB1df1337dcbbd4643ec984ff15bb9271eeafa9516

Merge branch 'master' into sculpt-mode-features

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index f6825668b0d,212427dead9..da187af8c77
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -268,26 -300,11 +300,24 @@@ class VIEW3D_PT_tools_brush(Panel, View
              if not self.is_popover:
                  brush_basic_sculpt_settings(col, context, brush)
  
 +            # normal_radius_factor
 +            col.separator()
 +            row = col.row()
 +            row.prop(brush, "normal_radius_factor", slider=True)
 +
 +            col.separator()
 +            row = col.row()
 +            row.prop(brush, "curve_preset")
 +
 +            col.separator()
 +            row = col.row()
 +            row.prop(brush, "automasking_mode")
 +
              # topology_rake_factor
-             if (capabilities.has_topology_rake and
-                 context.sculpt_object.use_dynamic_topology_sculpting
+             if (
+                     capabilities.has_topology_rake and
+                     context.sculpt_object.use_dynamic_topology_sculpting
              ):
-                 col.separator()
                  row = col.row()
                  row.prop(brush, "topology_rake_factor", slider=True)
  
diff --cc source/blender/blenloader/intern/versioning_280.c
index ff95e094ea4,6c5eb269c5c..6f8bbfb5c34
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2928,10 -2921,15 +2928,21 @@@ void blo_do_versions_280(FileData *fd, 
  			}
  		}
  
 +		if (!DNA_struct_elem_find(fd->filesdna, "Mesh", "float", "voxel_size")) {
 +			for (Mesh *me = bmain->meshes.first; me; me = me->id.next) {
 +				me->voxel_size = 0.1f;
 +			}
 +		}
++
+ 		if (!DNA_struct_elem_find(fd->filesdna, "TriangulateModifierData", "int", "min_vertices")) {
+ 			for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) {
+ 				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+ 					if (md->type == eModifierType_Triangulate) {
+ 						TriangulateModifierData *smd = (TriangulateModifierData *)md;
+ 						smd->min_vertices = 4;
+ 					}
+ 				}
+ 			}
+ 		}
  	}
  }
diff --cc source/blender/makesrna/intern/rna_brush.c
index a77faf01ece,7e4482790af..e1075028934
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@@ -1425,26 -1434,12 +1436,32 @@@ static void rna_def_brush(BlenderRNA *b
  		{0, NULL, 0, NULL, NULL},
  	};
  
 +	static const EnumPropertyItem brush_curve_preset_items[] = {
 +		{BRUSH_CURVE_CUSTOM, "CUSTOM", 0, "Custom", ""},
 +		{BRUSH_CURVE_SMOOTH, "SMOOTH", 0, "Smooth", ""},
 +		{BRUSH_CURVE_SPHERE, "SPHERE", 0, "Sphere", ""},
 +		{BRUSH_CURVE_ROOT, "ROOT", 0, "Root", ""},
 +		{BRUSH_CURVE_SHARP, "SHARP", 0, "Sharp", ""},
 +		{BRUSH_CURVE_LIN, "LIN", 0, "Linear", ""},
 +		{BRUSH_CURVE_POW4, "POW4", 0, "Sharper", ""},
 +		{BRUSH_CURVE_INVSQUARE, "INVSQUARE", 0, "Inverse square", ""},
 +		{BRUSH_CURVE_CONSTANT, "CONSTANT", 0, "Constant", ""},
 +		{0, NULL, 0, NULL, NULL},
 +	};
 +
 +	static const EnumPropertyItem brush_automasking_mode_items[] = {
 +		{BRUSH_AUTOMASKING_NONE, "NONE", 0, "Disabled", ""},
 +		{BRUSH_AUTOMASKING_TOPOLOGY, "TOPOLOGY", 0, "Topology", ""},
 +		{0, NULL, 0, NULL, NULL},
 +	};
 +
 +
+ 	static const EnumPropertyItem brush_size_unit_items[] = {
+ 		{0, "VIEW", 0, "View", "Measure brush size relateve to the view"},
+ 		{BRUSH_LOCK_SIZE, "SCENE", 0, "Scene", "Measure brush size relateve to the scene"},
+ 		{0, NULL, 0, NULL, NULL},
+ 	};
+ 
  	srna = RNA_def_struct(brna, "Brush", "ID");
  	RNA_def_struct_ui_text(srna, "Brush", "Brush data-block for storing brush settings for painting and sculpting");
  	RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA);



More information about the Bf-blender-cvs mailing list