[Bf-blender-cvs] [bbfcd55] wiggly-widgets: Fix compilation after latest merge from master

Julian Eisel noreply at git.blender.org
Tue Aug 18 00:26:34 CEST 2015


Commit: bbfcd55395d810e8dfc5837af97121254cffd21b
Author: Julian Eisel
Date:   Tue Aug 18 00:25:51 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBbbfcd55395d810e8dfc5837af97121254cffd21b

Fix compilation after latest merge from master

===================================================================

M	source/blender/blenkernel/intern/facemap.c
M	source/blender/editors/object/object_fmap.c
M	source/blender/makesrna/intern/rna_wm.c

===================================================================

diff --git a/source/blender/blenkernel/intern/facemap.c b/source/blender/blenkernel/intern/facemap.c
index 2dca535..fb97b7f 100644
--- a/source/blender/blenkernel/intern/facemap.c
+++ b/source/blender/blenkernel/intern/facemap.c
@@ -46,7 +46,7 @@
 #include "BLI_string.h"
 #include "BLI_listbase.h"
 
-#include "BLF_translation.h"
+#include "BLT_translation.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/editors/object/object_fmap.c b/source/blender/editors/object/object_fmap.c
index cef2b06..4886c94 100644
--- a/source/blender/editors/object/object_fmap.c
+++ b/source/blender/editors/object/object_fmap.c
@@ -45,8 +45,6 @@
 #include "BLI_string.h"
 #include "BLI_listbase.h"
 
-#include "BLF_translation.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "ED_mesh.h"
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 6d35185..eca3392 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1861,7 +1861,7 @@ static void rna_def_widgetgroup(BlenderRNA *brna)
 #ifdef WITH_PYTHON
 	RNA_def_struct_register_funcs(srna, "rna_WidgetGroup_register", "rna_WidgetGroup_unregister", "rna_WidgetGroup_instance");
 #endif
-	RNA_def_struct_translation_context(srna, BLF_I18NCONTEXT_OPERATOR_DEFAULT);
+	RNA_def_struct_translation_context(srna, BLT_I18NCONTEXT_OPERATOR_DEFAULT);
 
 	prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);




More information about the Bf-blender-cvs mailing list