[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55205] trunk/blender/source/blender: Fix compilation error after recent changes to strict gcc flags

Sergey Sharybin sergey.vfx at gmail.com
Tue Mar 12 09:24:36 CET 2013


Revision: 55205
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55205
Author:   nazgul
Date:     2013-03-12 08:24:36 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Fix compilation error after recent changes to strict gcc flags

Dudes, please try building blender with all default features
before doing such a commits. It helps just a lot when bisecting
issues later.

Also solved const qualifier discard happens in recent monofont
commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_translation.c
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c	2013-03-12 08:24:30 UTC (rev 55204)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c	2013-03-12 08:24:36 UTC (rev 55205)
@@ -94,7 +94,7 @@
 {
 #ifdef WITH_INTERNATIONAL
 	if(unifont_mono_ttf == NULL) {
-		char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
+		const char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
 		if (fontpath) {
 			char unifont_path[1024];
 

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-03-12 08:24:30 UTC (rev 55204)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-03-12 08:24:36 UTC (rev 55205)
@@ -981,7 +981,6 @@
 	return success;
 }
 
-void BKE_ffmpeg_end(void);
 static void end_ffmpeg_impl(int is_autosplit);
 
 #ifdef WITH_AUDASPACE




More information about the Bf-blender-cvs mailing list