diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-03 21:48:00 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-03 21:48:00 +0300 |
commit | 55aadccbde3a44f9e9a7046f1478e31e2475f60c (patch) | |
tree | cab220402c0b742b9af330ca02d0ee913a9029c2 /source | |
parent | 72473a61b0a45cf31a42927e9b86d0f26a25590d (diff) | |
parent | 103fbb3afc076383b94910e535374c5db398d06c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 16 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 25 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 3 |
5 files changed, 12 insertions, 37 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 1cc8d8c381c..2c6ed0df04b 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1359,7 +1359,7 @@ void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use } /* make mesh */ - me = BKE_mesh_add(G.main, "Mesh"); + me = BKE_mesh_add(bmain, "Mesh"); me->totvert = totvert; me->totedge = totedge; me->totloop = totloop; @@ -1379,7 +1379,7 @@ void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use BKE_mesh_calc_normals(me); } else { - me = BKE_mesh_add(G.main, "Mesh"); + me = BKE_mesh_add(bmain, "Mesh"); DM_to_mesh(dm, me, ob, CD_MASK_MESH, false); } @@ -2200,7 +2200,7 @@ Mesh *BKE_mesh_new_from_object( int i; const bool render = (settings == eModifierMode_Render); const bool cage = !apply_modifiers; - bool do_mat_id_us = true; + bool do_mat_id_data_us = true; /* perform the mesh extraction based on type */ switch (ob->type) { @@ -2274,7 +2274,7 @@ Mesh *BKE_mesh_new_from_object( /* XXX The curve to mesh conversion is convoluted... But essentially, BKE_mesh_from_nurbs_displist() * already transfers the ownership of materials from the temp copy of the Curve ID to the new * Mesh ID, so we do not want to increase materials' usercount later. */ - do_mat_id_us = false; + do_mat_id_data_us = false; break; } @@ -2325,7 +2325,7 @@ Mesh *BKE_mesh_new_from_object( tmpmesh = BKE_mesh_copy(bmain, ob->data); /* XXX BKE_mesh_copy() already handles materials usercount. */ - do_mat_id_us = false; + do_mat_id_data_us = false; } /* if not getting the original caged mesh, get final derived mesh */ else { @@ -2375,7 +2375,7 @@ Mesh *BKE_mesh_new_from_object( tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpcu->mat[i]; } - if (do_mat_id_us && tmpmesh->mat[i]) { + if ((ob->matbits[i] || do_mat_id_data_us) && tmpmesh->mat[i]) { id_us_plus(&tmpmesh->mat[i]->id); } } @@ -2399,7 +2399,7 @@ Mesh *BKE_mesh_new_from_object( tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpmb->mat[i]; } - if (do_mat_id_us && tmpmesh->mat[i]) { + if ((ob->matbits[i] || do_mat_id_data_us) && tmpmesh->mat[i]) { id_us_plus(&tmpmesh->mat[i]->id); } } @@ -2424,7 +2424,7 @@ Mesh *BKE_mesh_new_from_object( tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : origmesh->mat[i]; } - if (do_mat_id_us && tmpmesh->mat[i]) { + if ((ob->matbits[i] || do_mat_id_data_us) && tmpmesh->mat[i]) { id_us_plus(&tmpmesh->mat[i]->id); } } diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 6b7867c845f..79fa7a7571a 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1047,10 +1047,8 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tfile.text, 250, 250, 250, 255); rgba_char_args_set(btheme->tfile.text_hi, 15, 15, 15, 255); // rgba_char_args_set(btheme->tfile.panel, 145, 145, 145, 255); /* bookmark/ui regions */ - rgba_char_args_set(btheme->tfile.active, 130, 130, 130, 255); /* selected files */ rgba_char_args_set(btheme->tfile.hilite, 255, 140, 25, 255); /* selected files */ - - rgba_char_args_set(btheme->tfile.grid, 250, 250, 250, 255); + rgba_char_args_set(btheme->tfile.image, 250, 250, 250, 255); rgba_char_args_set(btheme->tfile.movie, 250, 250, 250, 255); rgba_char_args_set(btheme->tfile.scene, 250, 250, 250, 255); diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 7fb294529c9..374db92297d 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -435,6 +435,7 @@ static void file_operatortypes(void) WM_operatortype_append(FILE_OT_bookmark_cleanup); WM_operatortype_append(FILE_OT_bookmark_move); WM_operatortype_append(FILE_OT_reset_recent); + WM_operatortype_append(FILE_OT_hidedot); WM_operatortype_append(FILE_OT_filenum); WM_operatortype_append(FILE_OT_directory_new); WM_operatortype_append(FILE_OT_delete); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 91e7286819d..c302034f527 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1901,37 +1901,12 @@ static void rna_def_userdef_theme_space_file(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Theme File Browser", "Theme settings for the File Browser"); rna_def_userdef_theme_spaces_main(srna); - rna_def_userdef_theme_spaces_list_main(srna); prop = RNA_def_property(srna, "selected_file", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "hilite"); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Selected File", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); - - prop = RNA_def_property(srna, "scrollbar", PROP_FLOAT, PROP_COLOR_GAMMA); - RNA_def_property_float_sdna(prop, NULL, "shade1"); - RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Scrollbar", ""); - RNA_def_property_update(prop, 0, "rna_userdef_update"); - - prop = RNA_def_property(srna, "scroll_handle", PROP_FLOAT, PROP_COLOR_GAMMA); - RNA_def_property_float_sdna(prop, NULL, "shade2"); - RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Scroll Handle", ""); - RNA_def_property_update(prop, 0, "rna_userdef_update"); - - prop = RNA_def_property(srna, "active_file", PROP_FLOAT, PROP_COLOR_GAMMA); - RNA_def_property_float_sdna(prop, NULL, "active"); - RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Active File", ""); - RNA_def_property_update(prop, 0, "rna_userdef_update"); - - prop = RNA_def_property(srna, "active_file_text", PROP_FLOAT, PROP_COLOR_GAMMA); - RNA_def_property_float_sdna(prop, NULL, "grid"); - RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Active File Text", ""); - RNA_def_property_update(prop, 0, "rna_userdef_update"); } static void rna_def_userdef_theme_space_outliner(BlenderRNA *brna) diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a11733c060b..ed3cce5fe8a 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -120,7 +120,8 @@ static void wm_keymap_item_properties_update_ot(wmKeyMapItem *kmi) } else { /* zombie keymap item */ - MEM_SAFE_FREE(kmi->ptr); + wm_keymap_item_free(kmi); + kmi->ptr = NULL; } } } |