Commit: 3368864bb7a0aea441a24da8a051e7f1e422b865
Author: Julian Eisel
Date: Sat Dec 19 15:01:43 2015 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB3368864bb7a0aea441a24da8a051e7f1e422b865
Fix C++ files not able to call ED_region_tag_redraw
ED_screen.h needs to be compiled with C compiler.
===================================================================
M source/blender/editors/include/ED_screen.h
M source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cpp
===================================================================
diff --git a/source/blender/editors/include/ED_screen.h
b/source/blender/editors/include/ED_screen.h
index 2a7d79c..56670ff 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -31,6 +31,10 @@
#ifndef __ED_SCREEN_H__
#define __ED_SCREEN_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "DNA_view2d_types.h"
@@ -203,5 +207,10 @@ void ED_region_cache_draw_cached_segments(const struct
ARegion *ar, const int nu
#define ED_KEYMAP_GPENCIL 32
#define ED_KEYMAP_HEADER 64
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __ED_SCREEN_H__ */
diff --git a/source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cpp
b/source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cpp
index 40fc51d..d8f070c 100644
--- a/source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cpp
+++ b/source/blender/windowmanager/intern/widgets/wm_widgetgrouptype.cpp
@@ -96,7 +96,7 @@ void wmWidgetGroupType::init(
/* just add here,
drawing will occur on next update */
BLI_addtail(&wmap->widgetgroups, wgroup);
//
wm_widgetmap_set_highlighted_widget(wmap, NULL, NULL, 0);
-//
ED_region_tag_redraw(ar);
+
ED_region_tag_redraw(ar);
}
}
}
@@ -119,7 +119,7 @@ void wmWidgetGroupType::unregister(bContext *C, Main *bmain)
wgroup_next =
wgroup->next;
if (wgroup->type_cxx ==
this) {
widgetgroup_free(C, wmap, wgroup);
-//
ED_region_tag_redraw(ar);
+
ED_region_tag_redraw(ar);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
