[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14417] trunk/blender/source/blender/src/ buttons_object.c:

[Brecht Van Lommel]

Revision: 14417
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14417
Author:   blendix
Date:     2008-04-14 12:09:44 +0200 (Mon, 14 Apr 2008)

Log Message:
-----------

Bugfix: modifier buttons in the particle panel were locked unnecessarily
with edited hair.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_object.c

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-04-14 08:51:10 UTC (rev 14416)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-04-14 10:09:44 UTC (rev 14417)
@@ -4909,6 +4909,14 @@
 
 	}
 
+	md= (ModifierData*)psys_get_modifier(ob, psys);
+	if(md) {
+		uiBlockBeginAlign(block);
+		uiDefIconButBitI(block, TOG, eModifierMode_Render, B_PART_RECALC, ICON_SCENE, butx+butw-40, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during rendering");
+		but= uiDefIconButBitI(block, TOG, eModifierMode_Realtime, B_PART_RECALC, VICON_VIEW3D, butx+butw-20, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during interactive display");
+		uiBlockEndAlign(block);
+	}
+
 	if(psys->flag & PSYS_EDITED) {
 		lockmessage= "Hair is edited!";
 		lock= 1;
@@ -4923,14 +4931,6 @@
 
 	uiDefButS(block, MENU, B_PARTTYPE, "Type%t|Hair%x2|Reactor%x1|Emitter%x0", butx,buty,butw-45,buth, &part->type, 14.0, 0.0, 0, 0, "Type of particle system");
 
-	md= (ModifierData*)psys_get_modifier(ob, psys);
-	if(md) {
-		uiBlockBeginAlign(block);
-		uiDefIconButBitI(block, TOG, eModifierMode_Render, B_PART_RECALC, ICON_SCENE, butx+butw-40, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during rendering");
-		but= uiDefIconButBitI(block, TOG, eModifierMode_Realtime, B_PART_RECALC, VICON_VIEW3D, butx+butw-20, buty, 20, 20,&md->mode, 0, 0, 1, 0, "Enable particle system during interactive display");
-		uiBlockEndAlign(block);
-	}
-
 	buty-=5;
 	uiDefBut(block, LABEL, 0, "Basic:",					butx,(buty-=buth),butw,buth, NULL, 0.0, 0, 0, 0, "");
 	uiBlockBeginAlign(block);