diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 17:55:06 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 17:55:06 +0300 |
| commit | 8ae25e307eba0056a658d98a173799eb12d9b99c (patch) | |
| tree | d01227d31331c86471f208acd22b332542292917 | |
| parent | 4319e9499e3afcf8f1213d4bc00c7e6fc5570cae (diff) | |
| parent | ec8a20fec0d103a799b9d9c86b0b55fba3b02b84 (diff) | |
Merge branch 'blender2.8' into ui_layout_gridflowui_layout_gridflow
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index aaf96a47711..d67f702ba85 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -439,8 +439,8 @@ void DepsgraphNodeBuilder::build_id(ID *id) { } void DepsgraphNodeBuilder::build_collection( - eDepsNode_CollectionOwner owner_type, - Collection *collection) + eDepsNode_CollectionOwner owner_type, + Collection *collection) { if (built_map_.checkIsBuiltAndTag(collection)) { return; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 74f01c0a1a4..0d05d03e3a9 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -722,11 +722,11 @@ static const EnumPropertyItem *rna_UserDef_studiolight_icon_id_itemf( int totitem = 0; StudioLight *sl = (StudioLight *)ptr->data; - if ((sl->flag & (STUDIOLIGHT_ORIENTATION_VIEWNORMAL | STUDIOLIGHT_ORIENTATION_CAMERA)) == 0) - { + if ((sl->flag & (STUDIOLIGHT_ORIENTATION_VIEWNORMAL | STUDIOLIGHT_ORIENTATION_CAMERA)) == 0) { EnumPropertyItem tmp = {0, sl->name, sl->radiance_icon_id, sl->name, ""}; RNA_enum_item_add(&item, &totitem, &tmp); } + { EnumPropertyItem tmp = {1, sl->name, sl->irradiance_icon_id, sl->name, ""}; RNA_enum_item_add(&item, &totitem, &tmp); @@ -754,7 +754,7 @@ static void rna_UserDef_studiolight_show_expanded_set(PointerRNA *ptr, const boo { StudioLight *sl = (StudioLight *)ptr->data; sl->flag ^= STUDIOLIGHT_UI_EXPANDED; - sl->flag |= value?STUDIOLIGHT_UI_EXPANDED: 0; + sl->flag |= value ? STUDIOLIGHT_UI_EXPANDED : 0; } @@ -4936,9 +4936,10 @@ void RNA_def_userdef(BlenderRNA *brna) prop = RNA_def_property(srna, "studio_lights", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "StudioLight"); - RNA_def_property_collection_funcs(prop, "rna_UserDef_studiolight_begin", "rna_iterator_listbase_next", - "rna_iterator_listbase_end", "rna_iterator_listbase_get", - NULL, NULL, NULL, NULL); + RNA_def_property_collection_funcs( + prop, "rna_UserDef_studiolight_begin", "rna_iterator_listbase_next", + "rna_iterator_listbase_end", "rna_iterator_listbase_get", + NULL, NULL, NULL, NULL); func = RNA_def_function(srna, "studio_lights_refresh", "rna_UserDef_studiolight_refresh"); RNA_def_function_ui_description(func, "Refresh Studio Lights"); |