[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32620] trunk/blender/source/blender: fix for fix [#24344] crash on adding new image when composite is open and there is no Nodetree

[Campbell Barton]

Revision: 32620
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32620
Author:   campbellbarton
Date:     2010-10-21 06:21:09 +0200 (Thu, 21 Oct 2010)

Log Message:
-----------
fix for fix [#24344] crash on adding new image when composite is open and there 
is no Nodetree
also use const prefix in solidify modifier where possible.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/modifiers/intern/MOD_solidify.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c       2010-10-21 
01:55:39 UTC (rev 32619)
+++ trunk/blender/source/blender/blenkernel/intern/node.c       2010-10-21 
04:21:09 UTC (rev 32620)
@@ -1803,7 +1803,7 @@
 {
        int change = FALSE;
 
-       if(id==NULL)
+       if(ELEM(NULL, id, ntree))
                return change;
        
        if(ntree->type==NTREE_COMPOSIT) {

Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c        
2010-10-21 01:55:39 UTC (rev 32619)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c        
2010-10-21 04:21:09 UTC (rev 32620)
@@ -198,15 +198,15 @@
 {
        int i;
        DerivedMesh *result;
-       SolidifyModifierData *smd = (SolidifyModifierData*) md;
+       const SolidifyModifierData *smd = (SolidifyModifierData*) md;
 
        MFace *mf, *mface, *orig_mface;
        MEdge *ed, *medge, *orig_medge;
        MVert *mv, *mvert, *orig_mvert;
 
-       int numVerts = dm->getNumVerts(dm);
-       int numEdges = dm->getNumEdges(dm);
-       int numFaces = dm->getNumFaces(dm);
+       const int numVerts = dm->getNumVerts(dm);
+       const int numEdges = dm->getNumEdges(dm);
+       const int numFaces = dm->getNumFaces(dm);
 
        /* use for edges */
        int *new_vert_arr= NULL;
@@ -220,13 +220,13 @@
 
        float (*vert_nors)[3]= NULL;
 
-       float ofs_orig=                         - (((-smd->offset_fac + 1.0f) * 
0.5f) * smd->offset);
-       float ofs_new= smd->offset      - (((-smd->offset_fac + 1.0f) * 0.5f) * 
smd->offset);
+       float const ofs_orig=                           - (((-smd->offset_fac + 
1.0f) * 0.5f) * smd->offset);
+       float const ofs_new= smd->offset        - (((-smd->offset_fac + 1.0f) * 
0.5f) * smd->offset);
 
        /* weights */
        MDeformVert *dvert= NULL, *dv= NULL;
-       int defgrp_invert = ((smd->flag & MOD_SOLIDIFY_VGROUP_INV) != 0);
-       int defgrp_index= defgroup_name_index(ob, smd->defgrp_name);
+       const int defgrp_invert = ((smd->flag & MOD_SOLIDIFY_VGROUP_INV) != 0);
+       const int defgrp_index= defgroup_name_index(ob, smd->defgrp_name);
 
        if (defgrp_index >= 0)
                dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT);


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