From fed6c1a970f1df14da7c5fd4dfaf84371efcbe5d Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 2 Apr 2019 16:05:22 +0200 Subject: Fix T62876: Camera Background Images Migrate old legacy code to the draw mamager/object mode. The old legacy version did not work with wireframe. By migrating the code to modern draw manager code we have mode control on the drawing process. Still background images do not work with OIT, the cause seems to be that the transparent pixels are treated as background pixels. Also There are some artifacts when working with Holdouts and DoF, this is because the draw engines do not pass the correct alpha values. Reviewers: fclem, brecht Differential Revision: https://developer.blender.org/D4638 --- source/blender/makesdna/DNA_movieclip_types.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index c804a78eccb..efda24d6e0e 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -57,6 +57,17 @@ typedef struct MovieClipProxy { short build_tc_flag; } MovieClipProxy; +typedef struct MovieClip_RuntimeGPUTexture { + void *next, *prev; + MovieClipUser user; + /** Not written in file 2 = TEXTARGET_COUNT. */ + struct GPUTexture *gputexture[2]; +} MovieClip_RuntimeGPUTexture; + +typedef struct MovieClip_Runtime { + struct ListBase gputextures; +} MovieClip_Runtime; + typedef struct MovieClip { ID id; /** Animation data (must be immediately after id for utilities to use it). */ @@ -111,6 +122,8 @@ typedef struct MovieClip { /* color management */ ColorManagedColorspaceSettings colorspace_settings; + + struct MovieClip_Runtime runtime; } MovieClip; typedef struct MovieClipScopes { -- cgit v1.2.3 From 7070e4c15e6c57da2bd46534e654ed5f9a1e6600 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 21 Jun 2019 11:49:43 +0200 Subject: Revert "Particle system: Move runtime data to runtime field" This reverts commit 36faf739a71624b6ca10cec7233779f9eeace0bd. Somewhat annoying but this change had some unforeseen consequences, which lead to an actual bug. Since this change was not sufficient to get original report fixed is easier to simply revert for now. Fixes T65842: Hair disappears when clicking on particle system name --- source/blender/makesdna/DNA_modifier_types.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 0d87ae09943..a81bff60146 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -882,24 +882,17 @@ enum { MOD_MDEF_SURFACE = 1, }; -/* Is stored in ModifierData.runtime. */ -# -# -typedef struct ParticleSystemModifierDataRuntime { +typedef struct ParticleSystemModifierData { + ModifierData modifier; + + struct ParticleSystem *psys; /** Final Mesh - its topology may differ from orig mesh. */ struct Mesh *mesh_final; /** Original mesh that particles are attached to. */ struct Mesh *mesh_original; int totdmvert, totdmedge, totdmface; -} ParticleSystemModifierDataRuntime; - -typedef struct ParticleSystemModifierData { - ModifierData modifier; - - struct ParticleSystem *psys; - void *_pad1; short flag; - char _pad[6]; + char _pad[2]; } ParticleSystemModifierData; typedef enum { -- cgit v1.2.3