[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27348] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix for: [#21105] comb mode - bug with " free edit"
Janne Karhu
jhkarh at gmail.com
Tue Mar 9 04:27:08 CET 2010
Revision: 27348
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27348
Author: jhk
Date: 2010-03-09 04:27:05 +0100 (Tue, 09 Mar 2010)
Log Message:
-----------
Fix for: [#21105] comb mode - bug with "free edit"
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/drawobject.c
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-03-09 03:01:18 UTC (rev 27347)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-03-09 03:27:05 UTC (rev 27348)
@@ -5704,7 +5704,6 @@
(ob!=scene->obedit)
) {
ParticleSystem *psys;
- PTCacheEdit *edit = PE_get_current(scene, ob);
if(col || (ob->flag & SELECT)) cpack(0xFFFFFF); /* for visibility, also while wpaint */
//glDepthMask(GL_FALSE);
@@ -5715,9 +5714,11 @@
for(psys=ob->particlesystem.first; psys; psys=psys->next) {
/* run this so that possible child particles get cached */
- if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT)
+ if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) {
+ PTCacheEdit *edit = PE_create_current(scene, ob);
if(edit && edit->psys == psys)
draw_update_ptcache_edit(scene, ob, edit);
+ }
draw_new_particle_system(scene, v3d, rv3d, base, psys, dt);
}
@@ -5737,7 +5738,7 @@
) {
if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) {
- PTCacheEdit *edit = PE_get_current(scene, ob);
+ PTCacheEdit *edit = PE_create_current(scene, ob);
if(edit) {
glLoadMatrixf(rv3d->viewmat);
draw_ptcache_edit(scene, v3d, rv3d, ob, edit, dt);
More information about the Bf-blender-cvs
mailing list