Commit: e971f0a47e6bcd3c19342e0a66ee54e1ba9dd400
Author: Kévin Dietrich
Date: Mon Nov 23 09:09:46 2015 +0100
Branches: openvdb
https://developer.blender.org/rBe971f0a47e6bcd3c19342e0a66ee54e1ba9dd400
Merge branch 'master' into openvdb
===================================================================
===================================================================
diff --cc intern/cycles/render/nodes.h
index 0c7ef16,4f40612..08871fb
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@@ -24,8 -24,8 +24,9 @@@
CCL_NAMESPACE_BEGIN
class ImageManager;
+ class Scene;
class Shader;
+class VolumeManager;
/* Texture Mapping */
diff --cc intern/cycles/render/svm.cpp
index 9efa871,ad0ef95..52538b9
--- a/intern/cycles/render/svm.cpp
+++ b/intern/cycles/render/svm.cpp
@@@ -76,9 -76,9 +76,9 @@@ void SVMShaderManager::device_update(De
if(shader->use_mis && shader->has_surface_emission)
scene->light_manager->need_update = true;
- SVMCompiler compiler(scene->shader_manager,
scene->image_manager);
+ SVMCompiler compiler(scene->shader_manager,
scene->image_manager, scene->volume_manager);
compiler.background = ((int)i == scene->default_background);
- compiler.compile(shader, svm_nodes, i);
+ compiler.compile(scene, shader, svm_nodes, i);
}
dscene->svm_nodes.copy((uint4*)&svm_nodes[0], svm_nodes.size());
diff --cc intern/cycles/render/svm.h
index db07dd5,e48fe5e..e964e34
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@@ -53,8 -52,11 +53,11 @@@ public
class SVMCompiler {
public:
- SVMCompiler(ShaderManager *shader_manager, ImageManager *image_manager);
+ SVMCompiler(ShaderManager *shader_manager, ImageManager *image_manager,
VolumeManager *volume_manager_);
- void compile(Shader *shader, vector<int4>& svm_nodes, int index);
+ void compile(Scene *scene,
+ Shader *shader,
+ vector<int4>& svm_nodes,
+ int index);
void stack_assign(ShaderOutput *output);
void stack_assign(ShaderInput *input);
diff --cc source/blender/editors/space_view3d/drawobject.c
index ea63884,a2386c5..f6c81ba
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -8097,23 -8092,10 +8097,25 @@@ void draw_object(Scene *scene, ARegion
#endif
}
+ /* draw a single voxel to hint the user about the
resolution of the fluid */
+ {
+ copy_v3_v3(p0, sds->p0);
+
+ if (sds->flags & MOD_SMOKE_HIGHRES) {
+ madd_v3_v3v3fl(p1, p0, sds->cell_size,
1.0f / (sds->amplify + 1));
+ }
+ else {
+ add_v3_v3v3(p1, p0, sds->cell_size);
+ }
+
+ BKE_boundbox_init_from_minmax(&bb, p0, p1);
+ draw_box(bb.vec, false);
+ }
+
/* don't show smoke before simulation starts, this
could be made an option in the future */
- if (smd->domain->fluid && CFRA >=
smd->domain->point_cache[0]->startframe) {
+ if (sds->fluid && CFRA >=
sds->point_cache[0]->startframe) {
+ float p0[3], p1[3];
+
/* get view vector */
invert_m4_m4(ob->imat, ob->obmat);
mul_v3_mat3_m4v3(viewnormal, ob->imat,
rv3d->viewinv[2]);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
