[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61085] trunk/blender/source/blender/ editors/interface/interface_templates.c: Missing convert button on particle modifier panel.

Antony Riakiotakis kalast at gmail.com
Mon Nov 4 19:40:45 CET 2013


Revision: 61085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61085
Author:   psy-fi
Date:     2013-11-04 18:40:45 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
Missing convert button on particle modifier panel. Cache pathcache check
should be only on path display mode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-11-04 18:26:56 UTC (rev 61084)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-11-04 18:40:45 UTC (rev 61085)
@@ -967,11 +967,11 @@
 			if (md->type == eModifierType_ParticleSystem) {
 				ParticleSystem *psys = ((ParticleSystemModifierData *)md)->psys;
 				
-				if (!(ob->mode & OB_MODE_PARTICLE_EDIT) && psys->pathcache) {
+				if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
 					if (ELEM(psys->part->ren_as, PART_DRAW_GR, PART_DRAW_OB))
 						uiItemO(row, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Convert"), ICON_NONE,
 						        "OBJECT_OT_duplicates_make_real");
-					else if (psys->part->ren_as == PART_DRAW_PATH)
+					else if (psys->part->ren_as == PART_DRAW_PATH && psys->pathcache)
 						uiItemO(row, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Convert"), ICON_NONE,
 						        "OBJECT_OT_modifier_convert");
 				}




More information about the Bf-blender-cvs mailing list