[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27122] trunk/blender: allow cloth sim for linked duplicates, not many people use this but we need for using hair on linked characters, if there are bugs with this we' ll need to fix so enabling for now with comments that its experemental.

[Campbell Barton]

Revision: 27122
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27122
Author:   campbellbarton
Date:     2010-02-24 16:35:15 +0100 (Wed, 24 Feb 2010)

Log Message:
-----------
allow cloth sim for linked duplicates, not many people use this but we need for 
using hair on linked characters, if there are bugs with this we'll need to fix 
so enabling for now with comments that its experemental.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/rna_prop_ui.py
    trunk/blender/source/blender/blenkernel/intern/cloth.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py        2010-02-24 
15:06:18 UTC (rev 27121)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py        2010-02-24 
15:35:15 UTC (rev 27122)
@@ -179,9 +179,6 @@
         except:
             value_eval = value
 
-        if type(value_eval) == str:
-            value_eval = '"' + value_eval + '"'
-
         # First remove
         item = eval("context.%s" % path)
 
@@ -192,7 +189,7 @@
 
 
         # 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]

Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c      2010-02-24 
15:06:18 UTC (rev 27121)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c      2010-02-24 
15:35:15 UTC (rev 27122)
@@ -545,7 +545,7 @@
                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;

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2010-02-24 15:06:18 UTC (rev 27121)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2010-02-24 15:35:15 UTC (rev 27122)
@@ -3805,7 +3805,7 @@
                                        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;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs