archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2016-10-03 20:48:00 +02:00
parent 72473a61b0 103fbb3afc
commit 55aadccbde
17 changed files with 24 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/util/util_simd.h
View File

@@ -71,7 +71,7 @@ __forceinline operator int ( ) const { return std::numeric_limits<
#define _lzcnt_u64 __lzcnt64
#endif
#if defined(_WIN32) && !defined(__MINGW32__)
#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__clang__)
__forceinline int __popcnt(int in) {
return _mm_popcnt_u32(in);

1
release/scripts/modules/bpy_extras/keyconfig_utils.py
View File

@@ -136,6 +136,7 @@ KM_HIERARCHY = [
('Standard Modal Map', 'EMPTY', 'WINDOW', []),
('Transform Modal Map', 'EMPTY', 'WINDOW', []),
('Eyedropper Modal Map', 'EMPTY', 'WINDOW', []),
]

13
release/scripts/presets/interface_theme/back_to_black.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#354d66"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#b1b1b1"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#354d66">
<space>
<ThemeSpaceGeneric back="#000000"
title="#5d5d5d"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#181818"
list_title="#9e9e9e"
list_text="#5d5d5d"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/blender_24x.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#a0a0d0"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#a0a0d0">
<space>
<ThemeSpaceGeneric back="#808080"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#b4b4b4"
list_title="#000000"
list_text="#000000"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/elsyiun.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#755129"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#755129">
<space>
<ThemeSpaceGeneric back="#4b4b4b"
title="#8b8b8b"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#3b3b3b"
list_title="#8b8b8b"
list_text="#8b8b8b"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/flatty_light.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#ff8c19"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#ff8c19">
<space>
<ThemeSpaceGeneric back="#404040"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#808080"
list_title="#000000"
list_text="#000000"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/graph.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#607f9e"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#ffffff"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#607f9e">
<space>
<ThemeSpaceGeneric back="#4b4b4b"
title="#e4e4e4"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#3b3b3b"
list_title="#8b8b8b"
list_text="#8b8b8b"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/hexagon.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#69a5be"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#859cb9"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#69a5be">
<space>
<ThemeSpaceGeneric back="#646875"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#6c717f"
list_title="#d7d7d7"
list_text="#d7d7d7"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/rtheme.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#ff8c19"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#ff8c19">
<space>
<ThemeSpaceGeneric back="#9098a0"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#484848"
list_title="#000000"
list_text="#000000"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/science_lab.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#517da1"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#517da1">
<space>
<ThemeSpaceGeneric back="#363636"
title="#646464"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#444444"
list_title="#c0c0c0"
list_text="#999999"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/softimage.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#f1e593"
scrollbar="#4d4b4d"
scroll_handle="#8c8a88"
active_file="#f1e593"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#f1e593">
<space>
<ThemeSpaceGeneric back="#aca8a7"
title="#ffffff"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#aaa8a6"
list_title="#3a3a3a"
list_text="#7f7f7f"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/ubuntu_ambiance.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#6b395a"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#eeedeb"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#6b395a">
<space>
<ThemeSpaceGeneric back="#131311"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#3c3b37"
list_title="#95948f"
list_text="#95948f"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

16
source/blender/blenkernel/intern/mesh.c
View File

@@ -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);
}
}

2
source/blender/editors/interface/resources.c
View File

@@ -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);

1
source/blender/editors/space_file/space_file.c
View File

@@ -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);

25
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -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)

3
source/blender/windowmanager/intern/wm_keymap.c
View File

@@ -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;
}
}
}