[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46111] branches/smoke2: Update branch to match trunk smoke code

[Daniel Genrich]

Revision: 46111
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46111
Author:   genscher
Date:     2012-04-30 12:08:17 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Update branch to match trunk smoke code

Modified Paths:
--------------
    branches/smoke2/intern/smoke/intern/smoke_API.cpp
    branches/smoke2/source/blender/blenkernel/intern/smoke.c

Modified: branches/smoke2/intern/smoke/intern/smoke_API.cpp
===================================================================
--- branches/smoke2/intern/smoke/intern/smoke_API.cpp	2012-04-30 11:31:22 UTC (rev 46110)
+++ branches/smoke2/intern/smoke/intern/smoke_API.cpp	2012-04-30 12:08:17 UTC (rev 46111)
@@ -283,11 +283,6 @@
 	*z = fluid->_zVelocityOb;
 }
 
-extern "C" unsigned char *smoke_get_obstacle_anim(FLUID_3D *fluid)
-{
-	return fluid->_obstaclesAnim;
-}
-
 extern "C" void smoke_turbulence_set_noise(WTURBULENCE *wt, int type)
 {
 	wt->setNoise(type);

Modified: branches/smoke2/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/smoke2/source/blender/blenkernel/intern/smoke.c	2012-04-30 11:31:22 UTC (rev 46110)
+++ branches/smoke2/source/blender/blenkernel/intern/smoke.c	2012-04-30 12:08:17 UTC (rev 46111)
@@ -1279,8 +1279,7 @@
 				float *velocity_x = smoke_get_velocity_x(sds->fluid);								
 				float *velocity_y = smoke_get_velocity_y(sds->fluid);								
 				float *velocity_z = smoke_get_velocity_z(sds->fluid);								
-				unsigned char *obstacle = smoke_get_obstacle(sds->fluid);							
-				// DG TODO UNUSED unsigned char *obstacleAnim = smoke_get_obstacle_anim(sds->fluid);
+				unsigned char *obstacle = smoke_get_obstacle(sds->fluid);
 				int bigres[3];
 				short absolute_flow = (sfs->flags & MOD_SMOKE_FLOW_ABSOLUTE);
 				short high_emission_smoothing = bigdensity ? (sds->flags & MOD_SMOKE_HIGH_SMOOTH) : 0;