diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
| commit | a0a49b0bc968179b3a1ff65c12cffceb942f538e (patch) | |
| tree | 67698026477492c47933a51303ab339a2d17158c /src/AppleEvents.cc | |
| parent | f452c986e1639455c518daaa9213af2bb4b672cb (diff) | |
| parent | a126fa826c29b88a9edb3452e407de7f2e5a6c03 (diff) | |
Merge remote-tracking branch 'origin/issue181' into epec-kernel
Conflicts:
src/MainWindow.h
src/ModuleCache.cc
src/mainwin.cc
src/module.cc
src/module.h
src/parsersettings.cc
testdata/modulecache-tests/cascade.sh
testdata/modulecache-tests/cascade2.sh
Diffstat (limited to 'src/AppleEvents.cc')
| -rw-r--r-- | src/AppleEvents.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/AppleEvents.cc b/src/AppleEvents.cc index 1fb4f99..3102792 100644 --- a/src/AppleEvents.cc +++ b/src/AppleEvents.cc @@ -15,7 +15,7 @@ OSErr eventHandler(const AppleEvent *, AppleEvent *, SRefCon ) if (mainwin) break; } if (mainwin) { - mainwin->actionReloadCompile(); + mainwin->actionReloadRenderCSG(); } return noErr; } |