[Bf-blender-cvs] [72da543] gooseberry: Merge branch 'openvdb' into gooseberry

Lukas Tönne noreply at git.blender.org
Thu Jun 11 12:43:22 CEST 2015


Commit: 72da5433649921e64c4fca8d31dcc3021a058aed
Author: Lukas Tönne
Date:   Thu Jun 11 12:43:07 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB72da5433649921e64c4fca8d31dcc3021a058aed

Merge branch 'openvdb' into gooseberry

Conflicts:
	source/blender/makesdna/DNA_smoke_types.h

===================================================================



===================================================================

diff --cc source/blender/makesdna/DNA_smoke_types.h
index 7241ea4,2efa23f..6ca52f3
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@@ -155,12 -152,9 +154,13 @@@ typedef struct SmokeDomainSettings 
  	float flame_ignition, flame_max_temp;
  	float flame_smoke_color[3];
  
 +	/* display */
 +	float display_thickness;
 +	int pad2;
 +
  	struct ListBase vdb_caches;
 -	short use_openvdb, pad[3];
 +	short use_openvdb, pad3[3];
+ 	struct OpenVDBPrimitive *density, *density_high;
  } SmokeDomainSettings;
  
  typedef struct OpenVDBCache {




More information about the Bf-blender-cvs mailing list