Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-embree3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-embree3
Commits
4a3d94c0
Commit
4a3d94c0
authored
7 years ago
by
Clément Foucault
Browse files
Options
Downloads
Patches
Plain Diff
Eevee: Volumetrics: Fix crash when using smoke volumes.
parent
1ed28705
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/blender/draw/engines/eevee/eevee_volumes.c
+9
-6
9 additions, 6 deletions
source/blender/draw/engines/eevee/eevee_volumes.c
with
9 additions
and
6 deletions
source/blender/draw/engines/eevee/eevee_volumes.c
+
9
−
6
View file @
4a3d94c0
...
@@ -472,17 +472,20 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
...
@@ -472,17 +472,20 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
DRWShadingGroup
*
grp
=
DRW_shgroup_material_empty_tri_batch_create
(
mat
,
vedata
->
psl
->
volumetric_objects_ps
,
sldata
->
common_data
.
vol_tex_size
[
2
]);
DRWShadingGroup
*
grp
=
DRW_shgroup_material_empty_tri_batch_create
(
mat
,
vedata
->
psl
->
volumetric_objects_ps
,
sldata
->
common_data
.
vol_tex_size
[
2
]);
/* If shader failed to compile or is currently compiling. */
if
(
grp
==
NULL
)
{
return
;
}
/* Making sure it's updated. */
/* Making sure it's updated. */
invert_m4_m4
(
ob
->
imat
,
ob
->
obmat
);
invert_m4_m4
(
ob
->
imat
,
ob
->
obmat
);
BKE_mesh_texspace_get_reference
((
struct
Mesh
*
)
ob
->
data
,
NULL
,
&
texcoloc
,
NULL
,
&
texcosize
);
BKE_mesh_texspace_get_reference
((
struct
Mesh
*
)
ob
->
data
,
NULL
,
&
texcoloc
,
NULL
,
&
texcosize
);
if
(
grp
)
{
DRW_shgroup_uniform_block
(
grp
,
"common_block"
,
sldata
->
common_ubo
);
DRW_shgroup_uniform_block
(
grp
,
"common_block"
,
sldata
->
common_ubo
);
DRW_shgroup_uniform_mat4
(
grp
,
"volumeObjectMatrix"
,
(
float
*
)
ob
->
imat
);
DRW_shgroup_uniform_mat4
(
grp
,
"volumeObjectMatrix"
,
(
float
*
)
ob
->
imat
);
DRW_shgroup_uniform_vec3
(
grp
,
"volumeOrcoLoc"
,
texcoloc
,
1
);
DRW_shgroup_uniform_vec3
(
grp
,
"volumeOrcoLoc"
,
texcoloc
,
1
);
DRW_shgroup_uniform_vec3
(
grp
,
"volumeOrcoSize"
,
texcosize
,
1
);
DRW_shgroup_uniform_vec3
(
grp
,
"volumeOrcoSize"
,
texcosize
,
1
);
}
/* Smoke Simulation */
/* Smoke Simulation */
if
(((
ob
->
base_flag
&
BASE_FROMDUPLI
)
==
0
)
&&
if
(((
ob
->
base_flag
&
BASE_FROMDUPLI
)
==
0
)
&&
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment