← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/space_view3d/view3d_toolbar.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_view3d/view3d_toolbar.c
41
41
 
42
42
#include "BLI_math.h"
43
43
#include "BLI_blenlib.h"
44
 
#include "BLI_rand.h"
45
44
#include "BLI_utildefines.h"
46
45
#include "BLI_ghash.h"
47
46
 
156
155
{
157
156
        GHashIterator *iter = WM_operatortype_iter();
158
157
 
159
 
        for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
 
158
        for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) {
160
159
                wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
161
160
 
162
161
                if (BLI_strcasestr(ot->name, str)) {
163
162
                        if (WM_operator_poll((bContext *)C, ot)) {
164
163
                                
165
 
                                if (0 == uiSearchItemAdd(items, ot->name, ot, 0))
 
164
                                if (false == uiSearchItemAdd(items, ot->name, ot, 0))
166
165
                                        break;
167
166
                        }
168
167
                }
238
237
 
239
238
        pt = MEM_callocN(sizeof(PanelType), "spacetype view3d panel tools");
240
239
        strcpy(pt->idname, "VIEW3D_PT_tool_shelf");
241
 
        strcpy(pt->label, "Tool Shelf");
 
240
        strcpy(pt->label, N_("Tool Shelf"));
 
241
        strcpy(pt->translation_context, BLF_I18NCONTEXT_DEFAULT_BPYRNA);
242
242
        pt->draw = view3d_panel_tool_shelf;
243
243
        BLI_addtail(&art->paneltypes, pt);
244
244
}
249
249
        
250
250
        pt = MEM_callocN(sizeof(PanelType), "spacetype view3d panel last operator");
251
251
        strcpy(pt->idname, "VIEW3D_PT_last_operator");
252
 
        strcpy(pt->label, "Operator");
 
252
        strcpy(pt->label, N_("Operator"));
 
253
        strcpy(pt->translation_context, BLF_I18NCONTEXT_DEFAULT_BPYRNA);
253
254
        pt->draw_header = view3d_panel_operator_redo_header;
254
255
        pt->draw = view3d_panel_operator_redo;
255
256
        BLI_addtail(&art->paneltypes, pt);