[Bf-blender-cvs] [ff8df843c31] hair_guides_grooming: Merge branch 'hair_guides' into hair_guides_grooming
Lukas Tönne
noreply at git.blender.org
Tue Jul 3 09:11:57 CEST 2018
Commit: ff8df843c31cb41621204c579dbc34e8ce185708
Author: Lukas Tönne
Date: Tue Jul 3 07:40:46 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBff8df843c31cb41621204c579dbc34e8ce185708
Merge branch 'hair_guides' into hair_guides_grooming
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 62dc397d50a,e5e903f5338..49f8a610ca2
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -240,29 -255,27 +258,29 @@@ class VIEW3D_MT_editor_menus(Menu)
if gp_edit:
pass
elif mode_string == 'OBJECT':
- row.menu("INFO_MT_add", text="Add")
+ layout.menu("INFO_MT_add", text="Add")
elif mode_string == 'EDIT_MESH':
- row.menu("INFO_MT_mesh_add", text="Add")
+ layout.menu("INFO_MT_mesh_add", text="Add")
elif mode_string == 'EDIT_CURVE':
- row.menu("INFO_MT_curve_add", text="Add")
+ layout.menu("INFO_MT_curve_add", text="Add")
elif mode_string == 'EDIT_SURFACE':
- row.menu("INFO_MT_surface_add", text="Add")
+ layout.menu("INFO_MT_surface_add", text="Add")
elif mode_string == 'EDIT_METABALL':
- row.menu("INFO_MT_metaball_add", text="Add")
+ layout.menu("INFO_MT_metaball_add", text="Add")
+ elif mode_string == 'EDIT_GROOM':
+ layout.menu("INFO_MT_groom_add", text="Add")
elif mode_string == 'EDIT_ARMATURE':
- row.menu("INFO_MT_edit_armature_add", text="Add")
+ layout.menu("INFO_MT_edit_armature_add", text="Add")
if gp_edit:
- row.menu("VIEW3D_MT_edit_gpencil")
+ layout.menu("VIEW3D_MT_edit_gpencil")
elif edit_object:
- row.menu("VIEW3D_MT_edit_%s" % edit_object.type.lower())
+ layout.menu("VIEW3D_MT_edit_%s" % edit_object.type.lower())
if mode_string == 'EDIT_MESH':
- row.menu("VIEW3D_MT_edit_mesh_vertices")
- row.menu("VIEW3D_MT_edit_mesh_edges")
- row.menu("VIEW3D_MT_edit_mesh_faces")
+ layout.menu("VIEW3D_MT_edit_mesh_vertices")
+ layout.menu("VIEW3D_MT_edit_mesh_edges")
+ layout.menu("VIEW3D_MT_edit_mesh_faces")
elif obj:
if mode_string != 'PAINT_TEXTURE':
diff --cc source/blender/blenloader/intern/readfile.c
index 24d2defa781,188e2e5cdf5..0c8bf466d45
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9380,17 -9302,12 +9362,21 @@@ static void expand_particlesettings(Fil
}
}
}
+
+ for (ParticleDupliWeight *dw = part->dupliweights.first; dw; dw = dw->next) {
+ expand_doit(fd, mainvar, dw->ob);
+ }
}
+static void expand_groom(FileData *fd, Main *mainvar, Groom *groom)
+{
+ expand_doit(fd, mainvar, groom->scalp_object);
+
+ for (int a = 0; a < groom->totcol; a++) {
+ expand_doit(fd, mainvar, groom->mat[a]);
+ }
+}
+
static void expand_collection(FileData *fd, Main *mainvar, Collection *collection)
{
for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
diff --cc source/blender/editors/include/ED_screen.h
index eb172b0d3a9,0e335f89fb4..781c9c8a270
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@@ -260,60 -265,59 +265,60 @@@ void ED_keymap_screen(struct wmKeyCo
void ED_operatortypes_workspace(void);
/* operators; context poll callbacks */
- int ED_operator_screenactive(struct bContext *C);
- int ED_operator_screen_mainwinactive(struct bContext *C);
- int ED_operator_areaactive(struct bContext *C);
- int ED_operator_regionactive(struct bContext *C);
-
- int ED_operator_scene(struct bContext *C);
- int ED_operator_scene_editable(struct bContext *C);
- int ED_operator_objectmode(struct bContext *C);
-
- int ED_operator_view3d_active(struct bContext *C);
- int ED_operator_region_view3d_active(struct bContext *C);
- int ED_operator_animview_active(struct bContext *C);
- int ED_operator_outliner_active(struct bContext *C);
- int ED_operator_outliner_active_no_editobject(struct bContext *C);
- int ED_operator_file_active(struct bContext *C);
- int ED_operator_action_active(struct bContext *C);
- int ED_operator_buttons_active(struct bContext *C);
- int ED_operator_node_active(struct bContext *C);
- int ED_operator_node_editable(struct bContext *C);
- int ED_operator_graphedit_active(struct bContext *C);
- int ED_operator_sequencer_active(struct bContext *C);
- int ED_operator_sequencer_active_editable(struct bContext *C);
- int ED_operator_image_active(struct bContext *C);
- int ED_operator_nla_active(struct bContext *C);
- int ED_operator_info_active(struct bContext *C);
- int ED_operator_console_active(struct bContext *C);
-
-
- int ED_operator_object_active(struct bContext *C);
- int ED_operator_object_active_editable(struct bContext *C);
- int ED_operator_object_active_editable_mesh(struct bContext *C);
- int ED_operator_object_active_editable_font(struct bContext *C);
- int ED_operator_editmesh(struct bContext *C);
- int ED_operator_editmesh_view3d(struct bContext *C);
- int ED_operator_editmesh_region_view3d(struct bContext *C);
- int ED_operator_editarmature(struct bContext *C);
- int ED_operator_editcurve(struct bContext *C);
- int ED_operator_editcurve_3d(struct bContext *C);
- int ED_operator_editsurf(struct bContext *C);
- int ED_operator_editsurfcurve(struct bContext *C);
- int ED_operator_editsurfcurve_region_view3d(struct bContext *C);
- int ED_operator_editfont(struct bContext *C);
- int ED_operator_editlattice(struct bContext *C);
- int ED_operator_editmball(struct bContext *C);
- int ED_operator_editgroom(struct bContext *C);
- int ED_operator_uvedit(struct bContext *C);
- int ED_operator_uvedit_space_image(struct bContext *C);
- int ED_operator_uvmap(struct bContext *C);
- int ED_operator_posemode_exclusive(struct bContext *C);
- int ED_operator_posemode_context(struct bContext *C);
- int ED_operator_posemode(struct bContext *C);
- int ED_operator_posemode_local(struct bContext *C);
- int ED_operator_mask(struct bContext *C);
- int ED_operator_camera(struct bContext *C);
+ bool ED_operator_screenactive(struct bContext *C);
+ bool ED_operator_screen_mainwinactive(struct bContext *C);
+ bool ED_operator_areaactive(struct bContext *C);
+ bool ED_operator_regionactive(struct bContext *C);
+
+ bool ED_operator_scene(struct bContext *C);
+ bool ED_operator_scene_editable(struct bContext *C);
+ bool ED_operator_objectmode(struct bContext *C);
+
+ bool ED_operator_view3d_active(struct bContext *C);
+ bool ED_operator_region_view3d_active(struct bContext *C);
+ bool ED_operator_animview_active(struct bContext *C);
+ bool ED_operator_outliner_active(struct bContext *C);
+ bool ED_operator_outliner_active_no_editobject(struct bContext *C);
+ bool ED_operator_file_active(struct bContext *C);
+ bool ED_operator_action_active(struct bContext *C);
+ bool ED_operator_buttons_active(struct bContext *C);
+ bool ED_operator_node_active(struct bContext *C);
+ bool ED_operator_node_editable(struct bContext *C);
+ bool ED_operator_graphedit_active(struct bContext *C);
+ bool ED_operator_sequencer_active(struct bContext *C);
+ bool ED_operator_sequencer_active_editable(struct bContext *C);
+ bool ED_operator_image_active(struct bContext *C);
+ bool ED_operator_nla_active(struct bContext *C);
+ bool ED_operator_info_active(struct bContext *C);
+ bool ED_operator_console_active(struct bContext *C);
+
+
+ bool ED_operator_object_active(struct bContext *C);
+ bool ED_operator_object_active_editable(struct bContext *C);
+ bool ED_operator_object_active_editable_mesh(struct bContext *C);
+ bool ED_operator_object_active_editable_font(struct bContext *C);
+ bool ED_operator_editmesh(struct bContext *C);
+ bool ED_operator_editmesh_view3d(struct bContext *C);
+ bool ED_operator_editmesh_region_view3d(struct bContext *C);
+ bool ED_operator_editarmature(struct bContext *C);
+ bool ED_operator_editcurve(struct bContext *C);
+ bool ED_operator_editcurve_3d(struct bContext *C);
+ bool ED_operator_editsurf(struct bContext *C);
+ bool ED_operator_editsurfcurve(struct bContext *C);
+ bool ED_operator_editsurfcurve_region_view3d(struct bContext *C);
+ bool ED_operator_editfont(struct bContext *C);
+ bool ED_operator_editlattice(struct bContext *C);
+ bool ED_operator_editmball(struct bContext *C);
++bool ED_operator_editgroom(struct bContext *C);
+ bool ED_operator_uvedit(struct bContext *C);
+ bool ED_operator_uvedit_space_image(struct bContext *C);
+ bool ED_operator_uvmap(struct bContext *C);
+ bool ED_operator_posemode_exclusive(struct bContext *C);
+ bool ED_operator_posemode_context(struct bContext *C);
+ bool ED_operator_posemode(struct bContext *C);
+ bool ED_operator_posemode_local(struct bContext *C);
+ bool ED_operator_mask(struct bContext *C);
+ bool ED_operator_camera(struct bContext *C);
/* screen_user_menu.c */
diff --cc source/blender/editors/screen/screen_ops.c
index a2822ae3729,188592d6129..9bf7d53dc54
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@@ -532,15 -531,7 +532,15 @@@ bool ED_operator_editmball(bContext *C
return 0;
}
+int ED_operator_editgroom(bContext *C)
+{
+ Object *obedit = CTX_data_edit_object(C);
+ if (obedit && obedit->type == OB_GROOM)
+ return NULL != ((Groom *)obedit->data)->editgroom;
+ return 0;
+}
+
- int ED_operator_mask(bContext *C)
+ bool ED_operator_mask(bContext *C)
{
ScrArea *sa = CTX_wm_area(C);
if (sa && sa->spacedata.first) {
diff --cc source/blender/makesrna/intern/rna_sculpt_paint.c
index 9b1688a39b2,6f3a1afc156..2e5526dd6c6
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@@ -247,24 -247,7 +247,24 @@@ static char *rna_ParticleEdit_path(Poin
return BLI_strdup("tool_settings.particle_edit");
}
+static char *rna_GroomEditSettings_path(PointerRNA *UNUSED(ptr))
+{
+ return BLI_strdup("tool_settings.groom_edit_settings");
+}
+
+static void rna_GroomEditSettings_update(bContext *C, PointerRNA *UNUSED(ptr))
+{
+ ViewLayer *view
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list