Merge remote-tracking branch 'origin/blender-v2.82-release'
This commit is contained in:
commit
f357740a80
|
@ -82,6 +82,10 @@ if(WITH_CYCLES_NETWORK)
|
|||
add_definitions(-DWITH_NETWORK)
|
||||
endif()
|
||||
|
||||
if(WITH_MOD_FLUID)
|
||||
add_definitions(-DWITH_FLUID)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
||||
# avoid link failure with clang 3.4 debug
|
||||
|
|
|
@ -1345,7 +1345,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
|
|||
if (!b_domain) {
|
||||
return false;
|
||||
}
|
||||
|
||||
#if WITH_FLUID
|
||||
int3 resolution = get_int3(b_domain.domain_resolution());
|
||||
int length, amplify = (b_domain.use_noise()) ? b_domain.noise_scale() : 1;
|
||||
|
||||
|
@ -1411,7 +1411,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
|
|||
pixels[0] = 0.0f;
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
fprintf(stderr, "Cycles error: unexpected smoke volume resolution, skipping\n");
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Reference in New Issue