- own error with sound unpack operator using NULL pointer
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 Feb 2011 01:13:21 +0000 (01:13 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 Feb 2011 01:13:21 +0000 (01:13 +0000)
- make stub now creates 'Release' build by default.

GNUmakefile
source/blender/editors/sound/sound_ops.c

index eb21e0e167aaaf65a54f5ec06c7a5cbbc81a4311..17aef9075b2bbb2d7f5210e187a20848890a60d1 100644 (file)
@@ -60,7 +60,7 @@ all:
        if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
                mkdir -p $(BUILD_DIR) ; \
                cd $(BUILD_DIR) ; \
        if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
                mkdir -p $(BUILD_DIR) ; \
                cd $(BUILD_DIR) ; \
-               cmake $(BLENDER_DIR) ; \
+               cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=Release ; \
        fi
 
        @echo 
        fi
 
        @echo 
index 004fb33f0dd32b48c4a538fdda9536e958f5b303..30edc659fcb1d5308dc179915967de66cff8b280 100644 (file)
@@ -209,7 +209,7 @@ void SOUND_OT_pack(wmOperatorType *ot)
 static int sound_unpack_exec(bContext *C, wmOperator *op)
 {
        int method= RNA_enum_get(op->ptr, "method");
 static int sound_unpack_exec(bContext *C, wmOperator *op)
 {
        int method= RNA_enum_get(op->ptr, "method");
-       bSound* sound;
+       bSound* sound= NULL;
 
        /* find the suppplied image by name */
        if (RNA_property_is_set(op->ptr, "id")) {
 
        /* find the suppplied image by name */
        if (RNA_property_is_set(op->ptr, "id")) {