griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Color management: fix missed color management settings for new created scenes

Browse Source 
- Initialize color management settings if creating new scene
- Copy settings from active scene if creating with copying settings
  or if using other copy/link object settings

This also should fix issue with Export UV Layout operator
This commit is contained in:
Sergey Sharybin
2012-07-17 11:10:40 +00:00
parent c415a01fea
commit 8f85e93ea6
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/scene.c
View File

@@ -57,6 +57,7 @@
#include "BKE_anim.h"
#include "BKE_animsys.h"
#include "BKE_colortools.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_group.h"
@@ -132,6 +133,8 @@ Scene *BKE_scene_copy(Scene *sce, int type)
MEM_freeN(scen->toolsettings);
}
else {
ImageFormatData *im_format, *im_formatn;
scen = BKE_libblock_copy(&sce->id);
BLI_duplicatelist(&(scen->base), &(sce->base));
@@ -166,6 +169,13 @@ Scene *BKE_scene_copy(Scene *sce, int type)
obase = obase->next;
base = base->next;
}
/* copy color management settings */
im_format = &sce->r.im_format;
im_formatn = &scen->r.im_format;
BKE_color_managed_display_settings_copy(&im_formatn->display_settings, &im_format->display_settings);
BKE_color_managed_view_settings_copy(&im_formatn->view_settings, &im_format->view_settings);
}
/* tool settings */
@@ -545,6 +555,9 @@ Scene *BKE_scene_add(const char *name)
sound_create_scene(sce);
BKE_color_managed_display_settings_init(&sce->r.im_format.display_settings);
BKE_color_managed_view_settings_init(&sce->r.im_format.view_settings);
return sce;
}