[Bf-blender-cvs] [d46184a218a] soc-2020-info-editor: Continue merge
Mateusz Grzeliński
noreply at git.blender.org
Mon Jun 8 12:30:44 CEST 2020
Commit: d46184a218a662c4be4a52ae08cce18fe5db4805
Author: Mateusz Grzeliński
Date: Mon Jun 8 12:24:08 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBd46184a218a662c4be4a52ae08cce18fe5db4805
Continue merge
===================================================================
M build_files/build_environment/install_deps.sh
M intern/cycles/device/device_optix.cpp
M intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
M intern/mantaflow/intern/MANTA_main.cpp
M intern/mantaflow/intern/strings/fluid_script.h
M intern/mantaflow/intern/strings/liquid_script.h
M intern/mantaflow/intern/strings/smoke_script.h
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_sequencer.py
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenfont/intern/blf_glyph.c
M source/blender/blenfont/intern/blf_internal_types.h
M source/blender/blenfont/intern/blf_thumbs.c
M source/blender/blenkernel/BKE_fcurve.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/anim_data.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenlib/BLI_math_color.h
M source/blender/blenlib/intern/math_color.c
A source/blender/blenloader/BLO_read_write.h
M source/blender/blenloader/CMakeLists.txt
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/undofile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_290.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/CMakeLists.txt
M source/blender/bmesh/bmesh.h
R100 source/blender/bmesh/intern/bmesh_mesh_conv.c source/blender/bmesh/intern/bmesh_mesh_convert.c
R100 source/blender/bmesh/intern/bmesh_mesh_conv.h source/blender/bmesh/intern/bmesh_mesh_convert.h
R100 source/blender/bmesh/operators/bmo_mesh_conv.c source/blender/bmesh/operators/bmo_mesh_convert.c
M source/blender/draw/engines/select/select_draw_utils.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/armature/armature_add.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_undo.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/gpencil/gpencil_vertex_paint.c
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_anim.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_style.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/object/object_shader_fx.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_buttons/space_buttons.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/graph_utils.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_info/info_report.c
M source/blender/editors/space_info/space_info.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_ops.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/io/collada/AnimationImporter.cpp
M source/blender/io/collada/BCAnimationCurve.cpp
M source/blender/io/collada/BCAnimationSampler.cpp
M source/blender/makesdna/DNA_fluid_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_image.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nla.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/intern/MOD_armature.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_bevel.c
M source/blender/modifiers/intern/MOD_boolean.c
M source/blender/modifiers/intern/MOD_build.c
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_collision.c
M source/blender/modifiers/intern/MOD_correctivesmooth.c
M source/blender/modifiers/intern/MOD_curve.c
M source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
M source/blender/modifiers/intern/MOD_edgesplit.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_fluid.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_lattice.c
M source/blender/modifiers/intern/MOD_mask.cc
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/modifiers/intern/MOD_meshdeform.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_ocean.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_particlesystem.c
M source/blender/modifiers/intern/MOD_remesh.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shapekey.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_simulation.cc
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smooth.c
M source/blender/modifiers/intern/MOD_softbody.c
M source/blender/modifiers/intern/MOD_solidify.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_surface.c
M source/blender/modifiers/intern/MOD_surfacedeform.c
M source/blender/modifiers/intern/MOD_triangulate.c
A source/blender/modifiers/intern/MOD_ui_common.c
A source/blender/modifiers/intern/MOD_ui_common.h
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/modifiers/intern/MOD_uvwarp.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/modifiers/intern/MOD_weightvg_util.c
M source/blender/modifiers/intern/MOD_weightvg_util.h
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/modifiers/intern/MOD_weld.c
M source/blender/modifiers/intern/MOD_wireframe.c
M source/blender/python/intern/bpy_rna_anim.c
M tests/gtests/blenkernel/BKE_fcurve_test.cc
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 0bb6ca9ab70..9d9b975288d 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1535,11 +1535,13 @@ _update_deps_tbb() {
OSD_FORCE_REBUILD=true
OPENVDB_FORCE_REBUILD=true
USD_FORCE_REBUILD=true
+ EMBREE_FORCE_REBUILD=true
OIDN_FORCE_REBUILD=true
if [ "$_is_building" = true ]; then
OSD_FORCE_BUILD=true
OPENVDB_FORCE_BUILD=true
USD_FORCE_BUILD=true
+ EMBREE_FORCE_BUILD=true
OIDN_FORCE_BUILD=true
fi
}
@@ -2985,7 +2987,7 @@ compile_Embree() {
fi
# To be changed each time we make edits that would modify the compiled results!
- embree_magic=9
+ embree_magic=10
_init_embree
# Clean install if needed!
@@ -3039,9 +3041,13 @@ compile_Embree() {
cmake_d="$cmake_d -D EMBREE_RAY_MASK=ON"
cmake_d="$cmake_d -D EMBREE_FILTER_FUNCTION=ON"
cmake_d="$cmake_d -D EMBREE_BACKFACE_CULLING=OFF"
- cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=INTERNAL"
cmake_d="$cmake_d -D EMBREE_MAX_ISA=AVX2"
+ cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=TBB"
+ if [ -d $INST/tbb ]; then
+ make_d="$make_d EMBREE_TBB_ROOT=$INST/tbb"
+ fi
+
cmake $cmake_d ../
make -j$THREADS && make install
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp
index 441fa35f8af..db04c13d083 100644
--- a/intern/cycles/device/device_optix.cpp
+++ b/intern/cycles/device/device_optix.cpp
@@ -1537,34 +1537,22 @@ bool device_optix_init()
void device_optix_info(const vector<DeviceInfo> &cuda_devices, vector<DeviceInfo> &devices)
{
+ devices.reserve(cuda_devices.size());
+
// Simply add all supported CUDA devices as OptiX devices again
- for (const DeviceInfo &cuda_info : cuda_devices) {
- DeviceInfo info = cuda_info;
+ for (DeviceInfo info : cuda_devices) {
assert(info.type == DEVICE_CUDA);
- info.type = DEVICE_OPTIX;
- info.id += "_OptiX";
- // Figure out RTX support
- CUdevice cuda_device = 0;
- CUcontext cuda_context = NULL;
- unsigned int rtcore_version = 0;
- if (cuDeviceGet(&cuda_device, info.num) == CUDA_SUCCESS &&
- cuDevicePrimaryCtxRetain(&cuda_context, cuda_device) == CUDA_SUCCESS) {
- OptixDeviceContext optix_context = NULL;
- if (optixDeviceContextCreate(cuda_context, nullptr, &optix_context) == OPTIX_SUCCESS) {
- optixDeviceContextGetProperty(optix_context,
- OPTIX_DEVICE_PROPERTY_RTCORE_VERSION,
- &rtcore_version,
- sizeof(rtcore_version));
- optixDeviceContextDestroy(optix_context);
- }
- cuDevicePrimaryCtxRelease(cuda_device);
+ int major;
+ cuDeviceGetAttribute(&major, CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, info.num);
+ if (major < 5) {
+ continue; // Only Maxwell and up are supported by OptiX
}
- // Only add devices with RTX support
- if (rtcore_version != 0 || getenv("CYCLES_OPTIX_TEST")) {
- devices.push_back(info);
- }
+ info.type = DEVICE_OPTIX;
+ info.id += "_OptiX";
+
+ devices.push_back(info);
}
}
diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
index 5e30502f7ff..71e6af3fa4f 100644
--- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
@@ -181,7 +181,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
- bool needsUpsideDownDrawing(GHOST_Context &ghost_ctx) const
+ bool needsUpsideDownDrawing(GHOST_Context &ghost_ctx) const override
{
return ghost_ctx.isUpsideDown();
}
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 95013958561..e760cef8641 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -858,23 +858,144 @@ void MANTA::initializeRNAMap(FluidModifierData *mmd)
mRNAMap["GRAVITY_Y"] = to_string(mds->gravity[1]);
mRNAMap["GRAVITY_Z"] = to_string(mds->gravity[2]);
mRNAMap["CACHE_DIR"] = cacheDirectory;
- mRNAMap["NAME_DENSITY"] = FLUID_GRIDNAME_DENSITY;
- mRNAMap["NAME_SHADOW"] = FLUID_GRIDNAME_SHADOW;
- mRNAMap["NAME_HEAT"] = FLUID_GRIDNAME_HEAT;
- mRNAMap["NAME_VELOCITY"] = FLUID_GRIDNAME_VELOCITY;
- mRNAMap["NAME_COLORR"] = FLUID_GRIDNAME_COLORR;
- mRNAMap["NAME_COLORG"] = FLUID_GRIDNAME_COLORG;
- mRNAMap["NAME_COLORB"] = FLUID_GRIDNAME_COLORB;
- mRNAMap["NAME_FLAME"] = FLUID_GRIDNAME_FLAME;
- mRNAMap["NAME_FUEL"] = FLUID_GRIDNAME_FUEL;
- mRNAMap["NAME_REACT"] = FLUID_GRIDNAME_REACT;
- mRNAMap["NAME_DENSITYNOISE"] = FLUID_GRIDNAME_DENSITYNOISE;
- mRNAMap["NAME_COLORRNOISE"] = FLUID_GRIDNAME_COLORRNOISE;
- mRNAMap["NAME_COLORGNOISE"] = FLUID_GRIDNAME_COLORGNOISE;
- mRNAMap["NAME_COLORBNOISE"] = FLUID_GRIDNAME_COLORBNOISE;
- mRNAMap["NAME_FLAMENOISE"] = FLUID_GRIDNAME_FLAMENOISE;
- mRNAMap["NAME_FUELNOISE"] = FLUID_GRIDNAME_FUELNOISE;
- mRNAMap["NAME_REACTNOISE"] = FLUID_GRIDNAME_REACTNOISE;
+
+ /* Fluid object names. */
+ mRNAMap["NAME_FLAGS"] = FLUID_NAME_FLAGS;
+ mRNAMap["NAME_VELOCITY"] = FLUID_NAME_VELOCITY;
+ mRNAMap["NAME_VELOCITYTMP"] = FLUID_NAME_VELOCITYTMP;
+ mRNAMap["NAME_VELOCITY_X"] = FLUID_NAME_VELOCITYX;
+ mRNAMap["NAME_VELOCITY_Y"] = FLUID_NAME_VELOCITYY;
+ mRNAMap["NAME_VELOCITY_Z"] = FLUID_NAME_VELOCITYZ;
+ mRNAMap["NAME_PRESSURE"] = FLUID_NAME_PRESSURE;
+ mRNAMap["NAME_PHIOBS"] = FLUID_NAME_PHIOBS;
+ mRNAMap["NAME_PHISIN"] = FLUID_NAME_PHISIN;
+ mRNAMap["NAME_PHIIN"] = FLUID_NAME_PHIIN;
+ mRNAMap["NAME_PHIOUT"] = FLUID_NAME_PHIOUT;
+ mRNAMap["NAME_FORCES"] = FLUID_NAME_FORCES;
+ mRNAMap["NAME_FORCES_X"] = FLUID_NAME_FORCE_X;
+ mRNAMap["NAME_FORCES_Y"] = FLUID_NAME_FORCE_Y;
+ mRNAMap["NAME_FORCES_Z"] = FLUID_NAME_FORCE_Z;
+ mRNAMap["NAME_NUMOBS"] = FLUID_NAME_NUMOBS;
+ mRNAMap["NAME_PHIOBSSIN"] = FLUID_NAME_PHIOBSSIN;
+ mRNAMap["NAME_PHIOBSIN"] = FLUID_NAME_PHIOBSIN;
+ mRNAMap["NAME_OBVEL"] = FLUID_NAME_OBVEL;
+ mRNAMap["NAME_OBVELC"] = FLUID_NAME_OBVELC;
+ mRNAMap["NAME_OBVEL_X"] = FLUID_NAME_OBVEL_X;
+ mRNAMap["NAME_OBVEL_Y"] = FLUID_NAME_OBVEL_Y;
+ mRNAMap["NAME_OBVEL_Z"] = FLUID_NAME_OBVEL_Z;
+ mRNAMap["NAME_FRACTIONS"] = FLUID_NAME_FRACTIONS;
+ mRNAMap["NAME_INVELC"] = FLUID_NAME_INVELC;
+ mRNAMap["NAME_INVEL"] = FLUID_NAME_INVEL;
+ mRNAMap["NAME_INVEL_X"] = FLUID_NAME_INVEL_X;
+ mRNAMap["NAME_INVEL_Y"] = FLUID_NAME_INVEL_Y;
+ mRNAMap["NAME_INVEL_Z"] = FLUID_NAME_INVEL_Z;
+ mRNAMap["NAME_PHIOUTSIN"] = FLUID_NAME_PHIOUTSIN;
+ mRNAMap["NAME_PHIOUTIN"] = FLUID_NAME_PHIOUTIN;
+
+ /* Smoke object names. */
+ mRNAMap["NAME_SHADOW"] = FLUID_NAME_SHADOW;
+ mRNAMap["NAME_EMISSION"] = FLUID_NAME_EMISSION;
+ mRNAMap["NAME_EMISSIONIN"] = FLUID_NAME_EMISSIONIN;
+ mRNAMap["NAME_DENSITY"] = FLUID_NAME_DENSITY;
+ mRNAMap["NAME_DENSITYIN"] = FLUID_NAME_DENSITYIN;
+ mRNAMap["NAME_HEAT"] = FLUID_NAME_HEAT;
+ mRNAMap["NAME_HEATIN"] = FLUID_NAME_HEATIN;
+ mRNAMap["NAME_COLORR"] = FLUID_NAME_COLORR;
+ mRNAMap["NAME_COLORG"] = FLUID_NAME_COLORG;
+ mRNAMap["NAME_COLORB"] = FLUID_NAME_COLORB;
+ mRNAMap["NAME_COLORRIN"] = FLUID_NAME_COLORRIN;
+ mRNAMap["NAME_COLORGIN"] = FLUID_NAME_COLORGIN;
+ mRNAMap["NAME_COLORBIN"] = FLUID_NAME_COLORBIN;
+ mRNAMap["NAME_FLAME"] = FLUID_NAME_FLAME;
+ mRNAMap["NAME_FUEL"] = FLUID_NAME_FUEL;
+ mRNAMap["NAME_REACT"] = FLUID_NAME_REACT;
+ mRNAMap["NAME_FUELIN"] = FLUID_NAME_FUELIN;
+ mRNAMap["NAME_REACTIN"] = FLUID_NAME_REACTIN;
+
+ /* Liquid object names. */
+ mRNAMap["NAME_PHIPARTS"] = FLUID_NAME_PHIPARTS;
+ mRNAMap["NAME_PHI"] = FLUID_NAME_PHI;
+ mRNAMap["NAME_PHITMP"] = FLUID_NAME_PHITMP;
+ mRNAMap["NAME_VELOLD"] = FLUID_NAME_VELOCITYOLD;
+ mRNAMap["NAME_VELPARTS"] = FLUID_NAME_VELOCITYPARTS;
+ mRNAMap["NAME_MAPWEIGHTS"] = FLUID_NAME_MAPWEIGHTS;
+ mRNAMap["NAME_PP"] = FLUID_NAME_PP;
+ mRNAMap["NAME_PVEL"] = FLUID_NAME_PVEL;
+ mRNAMap["NAME_PINDEX"] = FLUID_NAME_PINDEX;
+ mRNAMap["NAME_GPI"] = FLUID_NAME_GPI;
+ mRNAMap["NAME_CURVATURE"] = FLUID_NAME_CURVATURE;
+
+ /* Noise object names. */
+ mRNAMap["NAME_VELOCITY_NOISE"] = FLUID_NAME_VELOCITY_NOISE;
+ mRNAMap["NAME_DENSITY_NOISE"] = FLUID_NAME_DENSITY_NOISE;
+ mRNAMap["NAME_PHIIN_NOISE"] = FLUID_NAME_PHIIN_NOISE;
+ mRNAMap["NAME_PHIOUT_NOISE"] = FLUID_NAME_PHIOUT_NOISE;
+ mRNAMap["NAME_PHIOBS_NOISE"] = FLUID_NAME_PHIOBS_NOISE;
+ mRNAMap["NAME_FLAGS_NOISE"] = FLUID_NAME_FLAGS_NOISE;
+ mRNAMap["NAME_TMPIN_NOISE"] = FLUID_NAME_TMPIN_NOISE;
+ mRNAMap["NAME_EMISSIONIN_NOISE"] = FLUID_NAME_EMISSIONIN_NOISE;
+ mRNAMap["NAME_ENERGY"] = FLUID_NAME_ENERGY;
+ mRNAMap["NAME_TMPFLAGS"] = FLUID_NAME_TMPFLAGS;
+ mRNAMap["NAME_TEXTURE_U"] = FLUID_NAME_TEXTURE_U;
+ mRNAMap["NAME_TEXTURE_V"] = FLUID_NAME_TEXTURE_V;
+ mRNAMap["NAME_TEXTURE_W"] = FLUID_NAME_TEXTURE_W;
+ mRNAMap["NAME_TEXTURE_U2"] = FLUID_NAME_TEXTURE_U2;
+ mRNAMap["NAME_TEXTURE_V2"] = FLUID_NAME_TEXTURE_V2;
+ mRNAMap["NAME_TEXTURE_W2"] = FLUID_NAME_TEXTURE_W2;
+ mRNAMap["NAME_UV0"] = FLUID_NAME_UV0;
+ mRNAMap["NAME_UV1"] = FLUID_NAME_UV1;
+ mRNAMap["NAME_COLORR_NOISE"] = FLUID_NAME_COLORR_NOISE;
+ mRNAMap["NAME_COLORG_NOISE"] = FLUID_NAME_COLORG_NOISE;
+ mRNAMap["NAME_COLORB_NOISE"] = FLUID_NAME_COLORB_NOISE;
+ mRNAMap["NAME_FLAME_NOISE"] = FLUID_NAME_FLAME_NOISE;
+ mRNAMap["NAME_FUEL_NOISE"] = FLUID_NAME_FUEL_NOISE;
+ mRNAMap["NAME_REACT_NOISE"] = FLUID_NAME_REACT_NOISE;
+
+ /* Mesh object names. */
+ mRNAMap["NAME_PHIPARTS_MESH"] = FLUID_NAME_PHIPARTS_MESH;
+ mRNAMap["NAME_PHI_MESH"] = FLUID_NAME_PHI_MESH;
+ mRNAMap["NAME_PP_MESH"] = FLUID_NAME_PP_MESH;
+ mRNAMap["NAME_FLAGS_MESH"] = FLUID_NAME_FLAGS_MESH;
+ mRNAMap["NAME_LMESH"] = FLUID_NAME_LMESH;
+ mRNAMap["NAME_VELOCITYVEC_MESH"] = FLUID_NAME_VELOCITYVEC_MESH;
+ mRNAMap["NAME_VELOCITY_MESH"] = FLUID_NAME_VELOCITY_MESH;
+ mRNAMap["NAME_PINDEX_MESH"] = FLUID_NAME_PINDEX_MESH;
+ mRNAMap["NAME_GPI_MESH"] = FLUID_NAME_GPI_MESH;
+
+ /* Particles object names. */
+ mRNAMap["NAME_PP_PARTICLES"] = FLUID_NAME_PP_PARTICLES;
+ mRNAM
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list