[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25626] trunk/blender: I had some extra stuff in last commit I didn't want to push.
Kent Mein
mein at cs.umn.edu
Wed Dec 30 17:29:13 CET 2009
Revision: 25626
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25626
Author: sirdude
Date: 2009-12-30 17:29:12 +0100 (Wed, 30 Dec 2009)
Log Message:
-----------
I had some extra stuff in last commit I didn't want to push.
Reverting...
Kent
Modified Paths:
--------------
trunk/blender/intern/opennl/superlu/get_perm_c.c
trunk/blender/intern/opennl/superlu/sgstrf.c
trunk/blender/source/Makefile
trunk/blender/source/nan_link.mk
Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c
===================================================================
--- trunk/blender/intern/opennl/superlu/get_perm_c.c 2009-12-30 16:18:06 UTC (rev 25625)
+++ trunk/blender/intern/opennl/superlu/get_perm_c.c 2009-12-30 16:29:12 UTC (rev 25626)
@@ -439,6 +439,8 @@
/* Transform perm_c into 0-based indexing. */
for (i = 0; i < n; ++i) --perm_c[i];
+ SUPERLU_FREE(b_colptr);
+ SUPERLU_FREE(b_rowind);
SUPERLU_FREE(invp);
SUPERLU_FREE(dhead);
SUPERLU_FREE(qsize);
@@ -451,6 +453,5 @@
} else { /* Empty adjacency structure */
for (i = 0; i < n; ++i) perm_c[i] = i;
}
- SUPERLU_FREE(b_colptr);
- SUPERLU_FREE(b_rowind);
+
}
Modified: trunk/blender/intern/opennl/superlu/sgstrf.c
===================================================================
--- trunk/blender/intern/opennl/superlu/sgstrf.c 2009-12-30 16:18:06 UTC (rev 25625)
+++ trunk/blender/intern/opennl/superlu/sgstrf.c 2009-12-30 16:29:12 UTC (rev 25626)
@@ -231,10 +231,7 @@
/* Allocate storage common to the factor routines */
*info = sLUMemInit(fact, work, lwork, m, n, Astore->nnz,
panel_size, L, U, &Glu, &iwork, &swork);
- if ( *info ) {
- if ( *iwork) SUPERLU_FREE (iwork);
- return;
- }
+ if ( *info ) return;
xsup = Glu.xsup;
supno = Glu.supno;
Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile 2009-12-30 16:18:06 UTC (rev 25625)
+++ trunk/blender/source/Makefile 2009-12-30 16:29:12 UTC (rev 25626)
@@ -196,6 +196,8 @@
ifeq ($(WITH_OPENJPEG), true)
ifndef BF_OPENJPEG_LIBS
COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
+ else
+ COMLIB += $(BF_OPENJPEG_LIBS)
endif
endif
Modified: trunk/blender/source/nan_link.mk
===================================================================
--- trunk/blender/source/nan_link.mk 2009-12-30 16:18:06 UTC (rev 25625)
+++ trunk/blender/source/nan_link.mk 2009-12-30 16:29:12 UTC (rev 25626)
@@ -177,10 +177,4 @@
LLIBS += $(BF_FFTW3_LIBS)
endif
-ifeq ($(WITH_OPENJPEG),true)
- ifneq (x$(BF_OPENJPEG_LIBS), x)
- LLIBS += $(BF_OPENJPEG_LIBS)
- endif
-endif
-
LLIBS += $(NAN_PYTHON_LIB)
More information about the Bf-blender-cvs
mailing list