diff options
| -rw-r--r-- | release/scripts/modules/rna_prop_ui.py | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index a25cf5ddd76..8079c461e43 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -179,9 +179,6 @@ class WM_OT_properties_edit(bpy.types.Operator): except: value_eval = value - if type(value_eval) == str: - value_eval = '"' + value_eval + '"' - # First remove item = eval("context.%s" % path) @@ -192,7 +189,7 @@ class WM_OT_properties_edit(bpy.types.Operator): # Reassign - exec_str = "item['%s'] = %s" % (prop, value_eval) + exec_str = "item['%s'] = %s" % (prop, repr(value_eval)) # print(exec_str) exec(exec_str) self._last_prop[:] = [prop] diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 86591fe784d..855de95572a 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -545,7 +545,7 @@ DerivedMesh *clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, implicit_set_positions(clmd); cache->flag |= PTCACHE_SIMULATION_VALID; } - else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) { + else if( /*ob->id.lib ||*/ (cache->flag & PTCACHE_BAKED)) { /* 2.4x disabled lib, but this can be used in some cases, testing further - campbell */ /* if baked and nothing in cache, do nothing */ cache->flag &= ~PTCACHE_SIMULATION_VALID; cache->simframe= 0; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index a4784fc606d..f699428abba 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3805,7 +3805,7 @@ static void system_step(ParticleSimulationData *sim, float cfra) pa->alive = PARS_ALIVE; } } - else if(cfra != startframe && (sim->ob->id.lib || (cache->flag & PTCACHE_BAKED))) { + else if(cfra != startframe && ( /*sim->ob->id.lib ||*/ (cache->flag & PTCACHE_BAKED))) { /* 2.4x disabled lib, but this can be used in some cases, testing further - campbell */ psys_reset(psys, PSYS_RESET_CACHE_MISS); psys->cfra=cfra; psys->recalc = 0; |