[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51985] trunk/blender/source/blender/ editors/physics/physics_fluid.c: Bugfix [#32939] Fluid sim reversed on X and Y with animated Control object

[Daniel Genrich]

Revision: 51985
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51985
Author:   genscher
Date:     2012-11-07 18:11:13 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Bugfix [#32939] Fluid sim reversed on X and Y with animated Control object

Bug was introduced in r48531 by accident since fluid control object abuse a variable for another flag which got reset.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48531

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/physics_fluid.c

Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-11-07 16:51:09 UTC (rev 51984)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-11-07 18:11:13 UTC (rev 51985)
@@ -574,7 +574,8 @@
 			fsmesh.channelScale            = NULL;
 			
 			/* Override user settings, only noslip is supported here! */
-			fsmesh.obstacleType = FLUIDSIM_OBSTACLE_NOSLIP;
+			if (fsmesh.type != OB_FLUIDSIM_CONTROL)
+				fsmesh.obstacleType = FLUIDSIM_OBSTACLE_NOSLIP;
 		}
 		
 		elbeemAddMesh(&fsmesh);